Skip to content

Commit f4dee75

Browse files
LMESTMadbridge
LMESTM
authored and
adbridge
committed
STM32 remove usage of deprecated MACROs
1 parent 2fbd01d commit f4dee75

File tree

12 files changed

+49
-49
lines changed

12 files changed

+49
-49
lines changed

‎targets/TARGET_STM/TARGET_STM32F0/analogout_api.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void analogout_init(dac_t *obj, PinName pin) {
5959
obj->pin = pin;
6060

6161
// Enable DAC clock
62-
__DAC1_CLK_ENABLE();
62+
__HAL_RCC_DAC1_CLK_ENABLE();
6363

6464
// Configure DAC
6565
DacHandle.Instance = (DAC_TypeDef *)(obj->dac);
@@ -78,9 +78,9 @@ void analogout_init(dac_t *obj, PinName pin) {
7878

7979
void analogout_free(dac_t *obj) {
8080
// Reset DAC and disable clock
81-
__DAC1_FORCE_RESET();
82-
__DAC1_RELEASE_RESET();
83-
__DAC1_CLK_DISABLE();
81+
__HAL_RCC_DAC1_FORCE_RESET();
82+
__HAL_RCC_DAC1_RELEASE_RESET();
83+
__HAL_RCC_DAC1_CLK_DISABLE();
8484

8585
// Configure GPIO
8686
pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));

‎targets/TARGET_STM/TARGET_STM32F1/TARGET_BLUEPILL_F103C8/device/hal_tick.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444

4545
#define TIM_MST TIM4
4646
#define TIM_MST_IRQ TIM4_IRQn
47-
#define TIM_MST_RCC __TIM4_CLK_ENABLE()
47+
#define TIM_MST_RCC __HAL_RCC_TIM4_CLK_ENABLE()
4848

49-
#define TIM_MST_RESET_ON __TIM4_FORCE_RESET()
50-
#define TIM_MST_RESET_OFF __TIM4_RELEASE_RESET()
49+
#define TIM_MST_RESET_ON __HAL_RCC__TIM4_FORCE_RESET()
50+
#define TIM_MST_RESET_OFF __HAL_RCC__TIM4_RELEASE_RESET()
5151

5252
#define TIM_MST_16BIT 1 // 1=16-bit timer, 0=32-bit timer
5353

‎targets/TARGET_STM/TARGET_STM32F1/TARGET_DISCO_F100RB/device/hal_tick.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444

4545
#define TIM_MST TIM4
4646
#define TIM_MST_IRQ TIM4_IRQn
47-
#define TIM_MST_RCC __TIM4_CLK_ENABLE()
47+
#define TIM_MST_RCC __HAL_RCC_TIM4_CLK_ENABLE()
4848

49-
#define TIM_MST_RESET_ON __TIM4_FORCE_RESET()
50-
#define TIM_MST_RESET_OFF __TIM4_RELEASE_RESET()
49+
#define TIM_MST_RESET_ON __HAL_RCC_TIM4_FORCE_RESET()
50+
#define TIM_MST_RESET_OFF __HAL_RCC_TIM4_RELEASE_RESET()
5151

5252
#define TIM_MST_16BIT 1 // 1=16-bit timer, 0=32-bit timer
5353

‎targets/TARGET_STM/TARGET_STM32F1/TARGET_NUCLEO_F103RB/device/hal_tick.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444

4545
#define TIM_MST TIM4
4646
#define TIM_MST_IRQ TIM4_IRQn
47-
#define TIM_MST_RCC __TIM4_CLK_ENABLE()
47+
#define TIM_MST_RCC __HAL_RCC_TIM4_CLK_ENABLE()
4848

49-
#define TIM_MST_RESET_ON __TIM4_FORCE_RESET()
50-
#define TIM_MST_RESET_OFF __TIM4_RELEASE_RESET()
49+
#define TIM_MST_RESET_ON __HAL_RCC_TIM4_FORCE_RESET()
50+
#define TIM_MST_RESET_OFF __HAL_RCC_TIM4_RELEASE_RESET()
5151

5252
#define TIM_MST_16BIT 1 // 1=16-bit timer, 0=32-bit timer
5353

‎targets/TARGET_STM/TARGET_STM32F1/serial_api.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -158,19 +158,19 @@ void serial_free(serial_t *obj)
158158

159159
// Reset UART and disable clock
160160
if (obj_s->uart == UART_1) {
161-
__USART1_FORCE_RESET();
162-
__USART1_RELEASE_RESET();
163-
__USART1_CLK_DISABLE();
161+
__HAL_RCC_USART1_FORCE_RESET();
162+
__HAL_RCC_USART1_RELEASE_RESET();
163+
__HAL_RCC_USART1_CLK_DISABLE();
164164
}
165165
if (obj_s->uart == UART_2) {
166-
__USART2_FORCE_RESET();
167-
__USART2_RELEASE_RESET();
168-
__USART2_CLK_DISABLE();
166+
__HAL_RCC_USART2_FORCE_RESET();
167+
__HAL_RCC_USART2_RELEASE_RESET();
168+
__HAL_RCC_USART2_CLK_DISABLE();
169169
}
170170
if (obj_s->uart == UART_3) {
171-
__USART3_FORCE_RESET();
172-
__USART3_RELEASE_RESET();
173-
__USART3_CLK_DISABLE();
171+
__HAL_RCC_USART3_FORCE_RESET();
172+
__HAL_RCC_USART3_RELEASE_RESET();
173+
__HAL_RCC_USART3_CLK_DISABLE();
174174
}
175175

176176
// Configure GPIOs

‎targets/TARGET_STM/gpio_api.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,34 +41,34 @@ GPIO_TypeDef *Set_GPIO_Clock(uint32_t port_idx) {
4141
switch (port_idx) {
4242
case PortA:
4343
gpio_add = GPIOA_BASE;
44-
__GPIOA_CLK_ENABLE();
44+
__HAL_RCC_GPIOA_CLK_ENABLE();
4545
break;
4646
case PortB:
4747
gpio_add = GPIOB_BASE;
48-
__GPIOB_CLK_ENABLE();
48+
__HAL_RCC_GPIOB_CLK_ENABLE();
4949
break;
5050
#if defined(GPIOC_BASE)
5151
case PortC:
5252
gpio_add = GPIOC_BASE;
53-
__GPIOC_CLK_ENABLE();
53+
__HAL_RCC_GPIOC_CLK_ENABLE();
5454
break;
5555
#endif
5656
#if defined GPIOD_BASE
5757
case PortD:
5858
gpio_add = GPIOD_BASE;
59-
__GPIOD_CLK_ENABLE();
59+
__HAL_RCC_GPIOD_CLK_ENABLE();
6060
break;
6161
#endif
6262
#if defined GPIOE_BASE
6363
case PortE:
6464
gpio_add = GPIOE_BASE;
65-
__GPIOE_CLK_ENABLE();
65+
__HAL_RCC_GPIOE_CLK_ENABLE();
6666
break;
6767
#endif
6868
#if defined GPIOF_BASE
6969
case PortF:
7070
gpio_add = GPIOF_BASE;
71-
__GPIOF_CLK_ENABLE();
71+
__HAL_RCC_GPIOF_CLK_ENABLE();
7272
break;
7373
#endif
7474
#if defined GPIOG_BASE
@@ -78,31 +78,31 @@ GPIO_TypeDef *Set_GPIO_Clock(uint32_t port_idx) {
7878
HAL_PWREx_EnableVddIO2();
7979
#endif
8080
gpio_add = GPIOG_BASE;
81-
__GPIOG_CLK_ENABLE();
81+
__HAL_RCC_GPIOG_CLK_ENABLE();
8282
break;
8383
#endif
8484
#if defined GPIOH_BASE
8585
case PortH:
8686
gpio_add = GPIOH_BASE;
87-
__GPIOH_CLK_ENABLE();
87+
__HAL_RCC_GPIOH_CLK_ENABLE();
8888
break;
8989
#endif
9090
#if defined GPIOI_BASE
9191
case PortI:
9292
gpio_add = GPIOI_BASE;
93-
__GPIOI_CLK_ENABLE();
93+
__HAL_RCC_GPIOI_CLK_ENABLE();
9494
break;
9595
#endif
9696
#if defined GPIOJ_BASE
9797
case PortJ:
9898
gpio_add = GPIOJ_BASE;
99-
__GPIOJ_CLK_ENABLE();
99+
__HAL_RCC_GPIOJ_CLK_ENABLE();
100100
break;
101101
#endif
102102
#if defined GPIOK_BASE
103103
case PortK:
104104
gpio_add = GPIOK_BASE;
105-
__GPIOK_CLK_ENABLE();
105+
__HAL_RCC_GPIOK_CLK_ENABLE();
106106
break;
107107
#endif
108108
default:

‎targets/TARGET_STM/hal_tick_16b.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ void timer_oc_irq_handler(void)
8484
if (__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_CC2) == SET) {
8585
if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_CC2) == SET) {
8686
__HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_CC2);
87-
uint32_t val = __HAL_TIM_GetCounter(&TimMasterHandle);
87+
uint32_t val = __HAL_TIM_GET_COUNTER(&TimMasterHandle);
8888
if ((val - PreviousVal) >= HAL_TICK_DELAY) {
8989
// Increment HAL variable
9090
HAL_IncTick();
9191
// Prepare next interrupt
92-
__HAL_TIM_SetCompare(&TimMasterHandle, TIM_CHANNEL_2, val + HAL_TICK_DELAY);
92+
__HAL_TIM_SET_COMPARE(&TimMasterHandle, TIM_CHANNEL_2, val + HAL_TICK_DELAY);
9393
PreviousVal = val;
9494
#if DEBUG_TICK > 0
9595
HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
@@ -128,8 +128,8 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
128128

129129
// Configure output compare channel 2 for HAL tick
130130
HAL_TIM_OC_Start(&TimMasterHandle, TIM_CHANNEL_2);
131-
PreviousVal = __HAL_TIM_GetCounter(&TimMasterHandle);
132-
__HAL_TIM_SetCompare(&TimMasterHandle, TIM_CHANNEL_2, PreviousVal + HAL_TICK_DELAY);
131+
PreviousVal = __HAL_TIM_GET_COUNTER(&TimMasterHandle);
132+
__HAL_TIM_SET_COMPARE(&TimMasterHandle, TIM_CHANNEL_2, PreviousVal + HAL_TICK_DELAY);
133133

134134
// Configure interrupts
135135
// Update interrupt used for 32-bit counter
@@ -155,7 +155,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
155155
HAL_TIM_Base_Start(&TimMasterHandle);
156156

157157
#if DEBUG_TICK > 0
158-
__GPIOB_CLK_ENABLE();
158+
__HAL_RCC_GPIOB_CLK_ENABLE();
159159
GPIO_InitTypeDef GPIO_InitStruct;
160160
GPIO_InitStruct.Pin = GPIO_PIN_6;
161161
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;

‎targets/TARGET_STM/hal_tick_32b.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void timer_irq_handler(void)
4747
// Increment HAL variable
4848
HAL_IncTick();
4949
// Prepare next interrupt
50-
__HAL_TIM_SetCompare(&TimMasterHandle, TIM_CHANNEL_2, val + HAL_TICK_DELAY);
50+
__HAL_TIM_SET_COMPARE(&TimMasterHandle, TIM_CHANNEL_2, val + HAL_TICK_DELAY);
5151
PreviousVal = val;
5252
#if DEBUG_TICK > 0
5353
HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
@@ -115,11 +115,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
115115
// Channel 2 for HAL tick
116116
HAL_TIM_OC_Start(&TimMasterHandle, TIM_CHANNEL_2);
117117
PreviousVal = __HAL_TIM_GetCounter(&TimMasterHandle);
118-
__HAL_TIM_SetCompare(&TimMasterHandle, TIM_CHANNEL_2, PreviousVal + HAL_TICK_DELAY);
118+
__HAL_TIM_SET_COMPARE(&TimMasterHandle, TIM_CHANNEL_2, PreviousVal + HAL_TICK_DELAY);
119119
__HAL_TIM_ENABLE_IT(&TimMasterHandle, TIM_IT_CC2);
120120

121121
#if DEBUG_TICK > 0
122-
__GPIOB_CLK_ENABLE();
122+
__HAL_RCC_GPIOB_CLK_ENABLE();
123123
GPIO_InitTypeDef GPIO_InitStruct;
124124
GPIO_InitStruct.Pin = GPIO_PIN_6;
125125
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;

‎targets/TARGET_STM/i2c_api.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -436,9 +436,9 @@ void i2c_frequency(i2c_t *obj, int hz)
436436

437437
// I2C configuration
438438
handle->Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT;
439-
handle->Init.DualAddressMode = I2C_DUALADDRESS_DISABLED;
440-
handle->Init.GeneralCallMode = I2C_GENERALCALL_DISABLED;
441-
handle->Init.NoStretchMode = I2C_NOSTRETCH_DISABLED;
439+
handle->Init.DualAddressMode = I2C_DUALADDRESS_DISABLE;
440+
handle->Init.GeneralCallMode = I2C_GENERALCALL_DISABLE;
441+
handle->Init.NoStretchMode = I2C_NOSTRETCH_DISABLE;
442442
handle->Init.OwnAddress1 = 0;
443443
handle->Init.OwnAddress2 = 0;
444444
HAL_I2C_Init(handle);

‎targets/TARGET_STM/rtc_api.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void rtc_init(void)
8383
error("PeriphClkInitStruct RTC failed with LSE\n");
8484
}
8585
#else /* !RTC_LSI */
86-
__PWR_CLK_ENABLE();
86+
__HAL_RCC_PWR_CLK_ENABLE();
8787

8888
// Reset Backup domain
8989
__HAL_RCC_BACKUPRESET_FORCE();
@@ -147,7 +147,7 @@ void rtc_free(void)
147147
{
148148
#if RTC_LSI
149149
// Enable Power clock
150-
__PWR_CLK_ENABLE();
150+
__HAL_RCC_PWR_CLK_ENABLE();
151151

152152
// Enable access to Backup domain
153153
HAL_PWR_EnableBkUpAccess();

‎targets/TARGET_STM/stm_spi_api.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,11 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
158158
handle->Init.Direction = SPI_DIRECTION_2LINES;
159159
handle->Init.CLKPhase = SPI_PHASE_1EDGE;
160160
handle->Init.CLKPolarity = SPI_POLARITY_LOW;
161-
handle->Init.CRCCalculation = SPI_CRCCALCULATION_DISABLED;
161+
handle->Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
162162
handle->Init.CRCPolynomial = 7;
163163
handle->Init.DataSize = SPI_DATASIZE_8BIT;
164164
handle->Init.FirstBit = SPI_FIRSTBIT_MSB;
165-
handle->Init.TIMode = SPI_TIMODE_DISABLED;
165+
handle->Init.TIMode = SPI_TIMODE_DISABLE;
166166

167167
init_spi(obj);
168168
}

‎targets/TARGET_STM/us_ticker_16b.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void set_compare(uint16_t count)
3535
{
3636
TimMasterHandle.Instance = TIM_MST;
3737
// Set new output compare value
38-
__HAL_TIM_SetCompare(&TimMasterHandle, TIM_CHANNEL_1, count);
38+
__HAL_TIM_SET_COMPARE(&TimMasterHandle, TIM_CHANNEL_1, count);
3939
// Enable IT
4040
__HAL_TIM_ENABLE_IT(&TimMasterHandle, TIM_IT_CC1);
4141
}

0 commit comments

Comments
 (0)