# HG changeset patch
# User jlarmour
# Date 1333478898 0
# Node ID e1cec8d66444bf76fd7c00c511278027fc0d13ee
# Parent  328e85803252ba317449fd3f09285fca120bc26f
* src/usb_stm32.c (cyg_usbs_cortexm_stm32_init):
CYGHWR_HAL_STM32_RCC_APB1ENR_CAN was renamed to
CYGHWR_HAL_STM32_RCC_APB1ENR_CAN1 in variant HAL.

diff --git a/packages/devs/usb/cortexm/stm32/current/ChangeLog b/packages/devs/usb/cortexm/stm32/current/ChangeLog
--- a/packages/devs/usb/cortexm/stm32/current/ChangeLog
+++ b/packages/devs/usb/cortexm/stm32/current/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-03  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* src/usb_stm32.c (cyg_usbs_cortexm_stm32_init):
+	CYGHWR_HAL_STM32_RCC_APB1ENR_CAN was renamed to
+	CYGHWR_HAL_STM32_RCC_APB1ENR_CAN1 in variant HAL.
+
 2010-10-27  Chris Holgate  <chris@zynaptic.com>
 
 	* src/usb_stm32.c, include/usb_stm32.h, cdl/usb_stm32.cdl: New
diff --git a/packages/devs/usb/cortexm/stm32/current/src/usb_stm32.c b/packages/devs/usb/cortexm/stm32/current/src/usb_stm32.c
--- a/packages/devs/usb/cortexm/stm32/current/src/usb_stm32.c
+++ b/packages/devs/usb/cortexm/stm32/current/src/usb_stm32.c
@@ -2230,7 +2230,7 @@ static void CYGBLD_ATTRIB_C_INIT_PRI(CYG
   // TODO: If a CAN driver is to be added to the standard distribution, this
   // should check for USB/CAN configuration clashes.
   HAL_READ_UINT32 (CYGHWR_HAL_STM32_RCC + CYGHWR_HAL_STM32_RCC_APB1ENR, reg_data);
-  reg_data &= ~((cyg_uint32) CYGHWR_HAL_STM32_RCC_APB1ENR_CAN);
+  reg_data &= ~((cyg_uint32) CYGHWR_HAL_STM32_RCC_APB1ENR_CAN1);
   HAL_WRITE_UINT32 (CYGHWR_HAL_STM32_RCC + CYGHWR_HAL_STM32_RCC_APB1ENR, reg_data);
   
   // Configure the IO pins for USB operation.