# HG changeset patch # User jlarmour # Date 1334339692 0 # Node ID bf98691daa6d259bb487b51095d592e68a31e620 # Parent 4885e072288413e26b3dc451bb15fe2919392adc * include/var_io.h: Added definitions, CYGHWR_HAL_STM32_USB_CLOCK, CYGHWR_HAL_STM32_CAN1_CLOCK and CYGHWR_HAL_STM32_CAN2_CLOCK diff --git a/packages/hal/cortexm/stm32/var/current/ChangeLog b/packages/hal/cortexm/stm32/var/current/ChangeLog --- a/packages/hal/cortexm/stm32/var/current/ChangeLog +++ b/packages/hal/cortexm/stm32/var/current/ChangeLog @@ -1,3 +1,9 @@ +2012-04-13 Christophe Coutand + + * include/var_io.h: + Added definitions, CYGHWR_HAL_STM32_USB_CLOCK, + CYGHWR_HAL_STM32_CAN1_CLOCK and CYGHWR_HAL_STM32_CAN2_CLOCK + 2012-03-27 James Smith * tests/timers.c (TIMER_PRI): Add macro and manifests to allow diff --git a/packages/hal/cortexm/stm32/var/current/include/var_io.h b/packages/hal/cortexm/stm32/var/current/include/var_io.h --- a/packages/hal/cortexm/stm32/var/current/include/var_io.h +++ b/packages/hal/cortexm/stm32/var/current/include/var_io.h @@ -1521,6 +1521,8 @@ #define CYGHWR_HAL_STM32_USB_DADDR_ADD(__x) VALUE_(0,(__x)) #define CYGHWR_HAL_STM32_USB_DADDR_EF BIT_(7) +#define CYGHWR_HAL_STM32_USB_CLOCK CYGHWR_HAL_STM32_CLOCK( APB1, USB ) + #endif // if defined(CYGHWR_HAL_CORTEXM_STM32_FAMILY_F1) // USB in F2/F4 parts is completely different. Definitions will be provided when implemented. @@ -1827,7 +1829,7 @@ #define CYGHWR_HAL_STM32_FSMC_PIO4 0xB0 - +#define CYGHWR_HAL_STM32_FSMC_BANK1_BASE 0x60000000 #define CYGHWR_HAL_STM32_FSMC_BANK2_BASE 0x70000000 #define CYGHWR_HAL_STM32_FSMC_BANK3_BASE 0x80000000 #define CYGHWR_HAL_STM32_FSMC_BANK4_BASE 0x90000000 @@ -1865,6 +1867,14 @@ #define CYGHWR_HAL_STM32_FSMC_SR_FEMPT BIT_(6) //============================================================================= +// CAN +// + +#define CYGHWR_HAL_STM32_CAN1_CLOCK CYGHWR_HAL_STM32_CLOCK( APB1, CAN1 ) +#define CYGHWR_HAL_STM32_CAN2_CLOCK CYGHWR_HAL_STM32_CLOCK( APB1, CAN2 ) + + +//============================================================================= // Ethernet MAC // Include separate header file for this to avoid this header getting unmanageable.