Skip to content

Commit 8e99081

Browse files
g-oikonomoug-oikonomou
committed
Remove all instances of ti_lib_rom_ macros
1 parent ec5c391 commit 8e99081

File tree

9 files changed

+30
-58
lines changed

9 files changed

+30
-58
lines changed

‎arch/cpu/cc26xx-cc13xx/dev/gpio-hal-arch.c

+1-9
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,7 @@ gpio_hal_arch_pin_cfg_set(gpio_hal_pin_t pin, gpio_hal_pin_cfg_t cfg)
5353
gpio_hal_pin_cfg_t tmp;
5454

5555
/* Clear settings that we are about to change, keep everything else */
56-
#ifdef ThisLibraryIsFor_CC26x0R2_HaltIfViolated
5756
config = ti_lib_ioc_port_configure_get(pin);
58-
#else
59-
config = ti_lib_rom_ioc_port_configure_get(pin);
60-
#endif
6157
config &= ~CONFIG_MASK;
6258

6359
tmp = cfg & GPIO_HAL_PIN_CFG_EDGE_BOTH;
@@ -87,7 +83,7 @@ gpio_hal_arch_pin_cfg_set(gpio_hal_pin_t pin, gpio_hal_pin_cfg_t cfg)
8783
config |= IOC_INT_ENABLE;
8884
}
8985

90-
ti_lib_rom_ioc_port_configure_set(pin, IOC_PORT_GPIO, config);
86+
ti_lib_ioc_port_configure_set(pin, IOC_PORT_GPIO, config);
9187
}
9288
/*---------------------------------------------------------------------------*/
9389
gpio_hal_pin_cfg_t
@@ -98,11 +94,7 @@ gpio_hal_arch_pin_cfg_get(gpio_hal_pin_t pin)
9894
uint32_t config;
9995

10096
cfg = 0;
101-
#ifdef ThisLibraryIsFor_CC26x0R2_HaltIfViolated
10297
config = ti_lib_ioc_port_configure_get(pin);
103-
#else
104-
config = ti_lib_rom_ioc_port_configure_get(pin);
105-
#endif
10698

10799
/* Pull */
108100
tmp = config & IOC_IOPULL_M;

‎arch/cpu/cc26xx-cc13xx/dev/gpio-hal-arch.h

+1-10
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,10 @@
5757

5858
#define gpio_hal_arch_interrupt_enable(p) interrupt_enable(p)
5959

60-
#ifdef ThisLibraryIsFor_CC26x0R2_HaltIfViolated
6160
#define gpio_hal_arch_interrupt_disable(p) ti_lib_ioc_int_disable(p)
6261
#define gpio_hal_arch_pin_set_input(p) ti_lib_ioc_pin_type_gpio_input(p)
6362
#define gpio_hal_arch_pin_set_output(p) ti_lib_ioc_pin_type_gpio_output(p)
64-
#else
65-
#define gpio_hal_arch_interrupt_disable(p) ti_lib_rom_ioc_int_disable(p)
66-
#define gpio_hal_arch_pin_set_input(p) ti_lib_rom_ioc_pin_type_gpio_input(p)
67-
#define gpio_hal_arch_pin_set_output(p) ti_lib_rom_ioc_pin_type_gpio_output(p)
68-
#endif
63+
6964
#define gpio_hal_arch_set_pin(p) ti_lib_gpio_set_dio(p)
7065
#define gpio_hal_arch_clear_pin(p) ti_lib_gpio_clear_dio(p)
7166
#define gpio_hal_arch_toggle_pin(p) ti_lib_gpio_toggle_dio(p)
@@ -80,11 +75,7 @@ static inline void
8075
interrupt_enable(gpio_hal_pin_t pin)
8176
{
8277
ti_lib_gpio_clear_event_dio(pin);
83-
#ifndef ThisLibraryIsFor_CC26x0R2_HaltIfViolated
84-
ti_lib_rom_ioc_int_enable(pin);
85-
#else
8678
ti_lib_ioc_int_enable(pin);
87-
#endif
8879
}
8980
/*---------------------------------------------------------------------------*/
9081
#endif /* GPIO_HAL_ARCH_H_ */

‎arch/cpu/cc26xx-cc13xx/dev/soc-rtc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ soc_rtc_init(void)
9999
ti_lib_aon_rtc_channel_enable(AON_RTC_CH1);
100100
ti_lib_aon_rtc_enable();
101101

102-
ti_lib_rom_int_enable(INT_AON_RTC_COMB);
102+
ti_lib_int_enable(INT_AON_RTC_COMB);
103103

104104
/* Re-enable interrupts */
105105
if(!interrupts_disabled) {

‎arch/cpu/cc26xx-cc13xx/dev/soc-trng.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -71,22 +71,22 @@ static void
7171
disable_number_ready_interrupt(void)
7272
{
7373
ti_lib_trng_int_disable(TRNG_NUMBER_READY);
74-
ti_lib_rom_int_disable(INT_TRNG_IRQ);
74+
ti_lib_int_disable(INT_TRNG_IRQ);
7575
}
7676
/*---------------------------------------------------------------------------*/
7777
static void
7878
enable_number_ready_interrupt(void)
7979
{
8080
ti_lib_trng_int_clear(TRNG_NUMBER_READY);
8181
ti_lib_trng_int_enable(TRNG_NUMBER_READY);
82-
ti_lib_rom_int_enable(INT_TRNG_IRQ);
82+
ti_lib_int_enable(INT_TRNG_IRQ);
8383
}
8484
/*---------------------------------------------------------------------------*/
8585
static bool
8686
accessible(void)
8787
{
8888
/* First, check the PD */
89-
if(ti_lib_rom_prcm_power_domain_status(PRCM_DOMAIN_PERIPH)
89+
if(ti_lib_prcm_power_domain_status(PRCM_DOMAIN_PERIPH)
9090
!= PRCM_DOMAIN_POWER_ON) {
9191
return false;
9292
}
@@ -104,12 +104,12 @@ static void
104104
power_up(void)
105105
{
106106
/* First, make sure the PERIPH PD is on */
107-
ti_lib_rom_prcm_power_domain_on(PRCM_DOMAIN_PERIPH);
108-
while((ti_lib_rom_prcm_power_domain_status(PRCM_DOMAIN_PERIPH)
107+
ti_lib_prcm_power_domain_on(PRCM_DOMAIN_PERIPH);
108+
while((ti_lib_prcm_power_domain_status(PRCM_DOMAIN_PERIPH)
109109
!= PRCM_DOMAIN_POWER_ON));
110110

111111
/* Enable clock in active mode */
112-
ti_lib_rom_prcm_peripheral_run_enable(PRCM_PERIPH_TRNG);
112+
ti_lib_prcm_peripheral_run_enable(PRCM_PERIPH_TRNG);
113113
ti_lib_prcm_load_set();
114114
while(!ti_lib_prcm_load_get());
115115
}
@@ -136,7 +136,7 @@ static uint64_t
136136
read_number(void)
137137
{
138138
uint64_t ran = (uint64_t)HWREG(TRNG_BASE + TRNG_O_OUT1) << 32;
139-
ran += ti_lib_rom_trng_number_get(TRNG_LOW_WORD);
139+
ran += ti_lib_trng_number_get(TRNG_LOW_WORD);
140140

141141
return ran;
142142
}
@@ -237,7 +237,7 @@ soc_trng_rand_asynchronous(uint32_t samples, soc_trng_callback_t cb)
237237
ti_lib_trng_int_clear(TRNG_NUMBER_READY);
238238

239239
/* Enable clock in sleep mode and register with LPM */
240-
ti_lib_rom_prcm_peripheral_sleep_enable(PRCM_PERIPH_TRNG);
240+
ti_lib_prcm_peripheral_sleep_enable(PRCM_PERIPH_TRNG);
241241
ti_lib_prcm_load_set();
242242
while(!ti_lib_prcm_load_get());
243243

@@ -271,7 +271,7 @@ PROCESS_THREAD(soc_trng_process, ev, data)
271271
}
272272

273273
/* Disable clock in sleep mode */
274-
ti_lib_rom_prcm_peripheral_sleep_disable(PRCM_PERIPH_TRNG);
274+
ti_lib_prcm_peripheral_sleep_disable(PRCM_PERIPH_TRNG);
275275
ti_lib_prcm_load_set();
276276
while(!ti_lib_prcm_load_get());
277277

‎arch/cpu/cc26xx-cc13xx/dev/spi-arch.c

+10-21
Original file line numberDiff line numberDiff line change
@@ -123,25 +123,22 @@ spi_arch_lock_and_open(const spi_device_t *dev)
123123
!= PRCM_DOMAIN_POWER_ON)) ;
124124

125125
/* Enable clock in active mode */
126-
ti_lib_rom_prcm_peripheral_run_enable(spi_controller[dev->spi_controller].prcm_periph);
126+
ti_lib_prcm_peripheral_run_enable(spi_controller[dev->spi_controller].prcm_periph);
127127
ti_lib_prcm_load_set();
128128
while(!ti_lib_prcm_load_get()) ;
129129

130130
/* SPI configuration */
131131
ti_lib_ssi_int_disable(spi_controller[dev->spi_controller].ssi_base, SSI_RXOR | SSI_RXFF | SSI_RXTO | SSI_TXFF);
132132
ti_lib_ssi_int_clear(spi_controller[dev->spi_controller].ssi_base, SSI_RXOR | SSI_RXTO);
133133

134-
#ifdef ThisLibraryIsFor_CC26x0R2_HaltIfViolated
135-
ti_lib_ssi_config_set_exp_clk(spi_controller[dev->spi_controller].ssi_base, ti_lib_sys_ctrl_clock_get(),
136-
get_mode(dev), SSI_MODE_MASTER, dev->spi_bit_rate, 8);
137-
ti_lib_ioc_pin_type_ssi_master(spi_controller[dev->spi_controller].ssi_base, dev->pin_spi_miso,
138-
dev->pin_spi_mosi, IOID_UNUSED, dev->pin_spi_sck);
139-
#else
140-
ti_lib_rom_ssi_config_set_exp_clk(spi_controller[dev->spi_controller].ssi_base, ti_lib_sys_ctrl_clock_get(),
141-
get_mode(dev), SSI_MODE_MASTER, dev->spi_bit_rate, 8);
142-
ti_lib_rom_ioc_pin_type_ssi_master(spi_controller[dev->spi_controller].ssi_base, dev->pin_spi_miso,
143-
dev->pin_spi_mosi, IOID_UNUSED, dev->pin_spi_sck);
144-
#endif
134+
ti_lib_ssi_config_set_exp_clk(spi_controller[dev->spi_controller].ssi_base,
135+
ti_lib_sys_ctrl_clock_get(),
136+
get_mode(dev), SSI_MODE_MASTER,
137+
dev->spi_bit_rate, 8);
138+
ti_lib_ioc_pin_type_ssi_master(spi_controller[dev->spi_controller].ssi_base,
139+
dev->pin_spi_miso,
140+
dev->pin_spi_mosi, IOID_UNUSED,
141+
dev->pin_spi_sck);
145142

146143
ti_lib_ssi_enable(spi_controller[dev->spi_controller].ssi_base);
147144

@@ -159,7 +156,7 @@ spi_arch_close_and_unlock(const spi_device_t *dev)
159156
}
160157

161158
/* Power down SSI */
162-
ti_lib_rom_prcm_peripheral_run_disable(spi_controller[dev->spi_controller].prcm_periph);
159+
ti_lib_prcm_peripheral_run_disable(spi_controller[dev->spi_controller].prcm_periph);
163160
ti_lib_prcm_load_set();
164161
while(!ti_lib_prcm_load_get()) ;
165162

@@ -213,20 +210,12 @@ spi_arch_transfer(const spi_device_t *dev,
213210
for(i = 0; i < totlen; i++) {
214211
c = i < wlen ? write_buf[i] : 0;
215212
ti_lib_ssi_data_put(spi_controller[dev->spi_controller].ssi_base, (uint8_t)c);
216-
#ifdef ThisLibraryIsFor_CC26x0R2_HaltIfViolated
217213
ti_lib_ssi_data_get(spi_controller[dev->spi_controller].ssi_base, &c);
218-
#else
219-
ti_lib_rom_ssi_data_get(spi_controller[dev->spi_controller].ssi_base, &c);
220-
#endif
221214
if(i < rlen) {
222215
inbuf[i] = (uint8_t)c;
223216
}
224217
}
225-
#ifdef ThisLibraryIsFor_CC26x0R2_HaltIfViolated
226218
while(ti_lib_ssi_data_get_non_blocking(spi_controller[dev->spi_controller].ssi_base, &c)) ;
227-
#else
228-
while(ti_lib_rom_ssi_data_get_non_blocking(spi_controller[dev->spi_controller].ssi_base, &c)) ;
229-
#endif
230219
return SPI_DEV_STATUS_OK;
231220
}
232221
/*---------------------------------------------------------------------------*/

‎arch/platform/srf06-cc26xx/launchpad/cc1350/rf-switch.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ LPM_MODULE(rf_switch_module, NULL, shutdown_handler, NULL, LPM_DOMAIN_NONE);
6363
void
6464
rf_switch_init()
6565
{
66-
ti_lib_rom_ioc_pin_type_gpio_output(POWER_PIN);
66+
ti_lib_ioc_pin_type_gpio_output(POWER_PIN);
6767
ti_lib_gpio_clear_dio(POWER_PIN);
68-
ti_lib_rom_ioc_pin_type_gpio_output(SELECT_PIN);
68+
ti_lib_ioc_pin_type_gpio_output(SELECT_PIN);
6969
ti_lib_gpio_clear_dio(SELECT_PIN);
7070

7171
lpm_register_module(&rf_switch_module);

‎arch/platform/srf06-cc26xx/platform.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ platform_init_stage_one()
162162
ti_lib_pwr_ctrl_io_freeze_disable();
163163

164164
#endif
165-
ti_lib_rom_int_enable(INT_AON_GPIO_EDGE);
165+
ti_lib_int_enable(INT_AON_GPIO_EDGE);
166166
ti_lib_int_master_enable();
167167

168168
soc_rtc_init();

‎arch/platform/srf06-cc26xx/sensortag/mpu-9250-sensor.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -601,11 +601,11 @@ configure(int type, int enable)
601601
{
602602
switch(type) {
603603
case SENSORS_HW_INIT:
604-
ti_lib_rom_ioc_pin_type_gpio_input(BOARD_IOID_MPU_INT);
604+
ti_lib_ioc_pin_type_gpio_input(BOARD_IOID_MPU_INT);
605605
ti_lib_ioc_io_port_pull_set(BOARD_IOID_MPU_INT, IOC_IOPULL_DOWN);
606606
ti_lib_ioc_io_hyst_set(BOARD_IOID_MPU_INT, IOC_HYST_ENABLE);
607607

608-
ti_lib_rom_ioc_pin_type_gpio_output(BOARD_IOID_MPU_POWER);
608+
ti_lib_ioc_pin_type_gpio_output(BOARD_IOID_MPU_POWER);
609609
ti_lib_ioc_io_drv_strength_set(BOARD_IOID_MPU_POWER, IOC_CURRENT_4MA,
610610
IOC_STRENGTH_MAX);
611611
ti_lib_gpio_clear_dio(BOARD_IOID_MPU_POWER);

‎arch/platform/srf06-cc26xx/srf06/als-sensor.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ config(int type, int enable)
5959
ti_lib_ioc_pin_type_gpio_output(BOARD_IOID_ALS_PWR);
6060
break;
6161
case SENSORS_ACTIVE:
62-
ti_lib_rom_ioc_pin_type_gpio_output(BOARD_IOID_ALS_PWR);
63-
ti_lib_rom_ioc_port_configure_set(BOARD_IOID_ALS_OUT, IOC_PORT_GPIO,
62+
ti_lib_ioc_pin_type_gpio_output(BOARD_IOID_ALS_PWR);
63+
ti_lib_ioc_port_configure_set(BOARD_IOID_ALS_OUT, IOC_PORT_GPIO,
6464
IOC_STD_OUTPUT);
65-
ti_lib_rom_ioc_pin_type_gpio_input(BOARD_IOID_ALS_OUT);
65+
ti_lib_ioc_pin_type_gpio_input(BOARD_IOID_ALS_OUT);
6666

6767
if(enable) {
6868
ti_lib_gpio_set_dio(BOARD_IOID_ALS_PWR);

0 commit comments

Comments
 (0)