Skip to content

Commit

Permalink
cpu/msp430: consistently use msp430 prefix in names
Browse files Browse the repository at this point in the history 
Previously sometimes `msp_` was used as prefix, sometimes `msp430_`.
This makes the naming consistent.
  • Loading branch information
@maribu
maribu committed Dec 6, 2023
1 parent 8f01dbf commit dd88935
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 48 deletions.
18 changes: 9 additions & 9 deletions cpu/msp430/include/f2xx_g2xx/msp430_regs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ typedef struct {
REG8 STAT; /**< status register */
REG8 RXBUF; /**< receive buffer */
REG8 TXBUF; /**< transmit buffer */
} msp_usci_a_t;
} msp430_usci_a_t;

/**
* @brief Universal Serial Control Interface Type B (USCI_B) Registers
Expand All @@ -61,7 +61,7 @@ typedef struct {
REG8 STAT; /**< status register */
REG8 RXBUF; /**< receive buffer */
REG8 TXBUF; /**< transmit buffer */
} msp_usci_b_t;
} msp430_usci_b_t;

/**
* @name USCI clock selection
Expand Down Expand Up @@ -111,10 +111,10 @@ typedef struct {
* | USCI A | ✔ | ✔ | ✗ | ✔ |
* | USCI B | ✗ | ✔ | ✔ | ✗ |
*/
static inline msp_usci_b_t * msp430_usci_b_from_usci_a(msp_usci_a_t *usci_a)
static inline msp430_usci_b_t * msp430_usci_b_from_usci_a(msp430_usci_a_t *usci_a)
{
uintptr_t usci_b = (uintptr_t)usci_a + offsetof(msp_usci_a_t, CTL0);
return (msp_usci_b_t *)usci_b;
uintptr_t usci_b = (uintptr_t)usci_a + offsetof(msp430_usci_a_t, CTL0);
return (msp430_usci_b_t *)usci_b;
}

/**
Expand All @@ -126,25 +126,25 @@ static inline msp_usci_b_t * msp430_usci_b_from_usci_a(msp_usci_a_t *usci_a)
*
* @details Provided by linker
*/
extern msp_usci_a_t USCI_A0;
extern msp430_usci_a_t USCI_A0;
/**
* @brief USCI_A1 register map
*
* @details Provided by linker
*/
extern msp_usci_a_t USCI_A1;
extern msp430_usci_a_t USCI_A1;
/**
* @brief USCI_B0 register map
*
* @details Provided by linker
*/
extern msp_usci_a_t USCI_B0;
extern msp430_usci_a_t USCI_B0;
/**
* @brief USCI_B1 register map
*
* @details Provided by linker
*/
extern msp_usci_a_t USCI_B1;
extern msp430_usci_a_t USCI_B1;
/** @} */

#ifdef __cplusplus
Expand Down
34 changes: 17 additions & 17 deletions cpu/msp430/include/msp430_regs_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,36 +87,36 @@ typedef struct {
REG8 IN; /**< input data */
REG8 OD; /**< output data */
REG8 DIR; /**< pin direction */
} msp_port_t;
} msp430_port_t;

/**
* @brief GPIO Port 1/2 (with interrupt functionality)
*/
typedef struct {
msp_port_t base; /**< common GPIO port registers */
msp430_port_t base; /**< common GPIO port registers */
REG8 IFG; /**< interrupt flag */
REG8 IES; /**< interrupt edge select */
REG8 IE; /**< interrupt enable */
REG8 SEL; /**< alternative function select */
} msp_port_p1_p2_t;
} msp430_port_p1_p2_t;

/**
* @brief GPIO Port 3..6 (without interrupt functionality)
*/
typedef struct {
msp_port_t base; /**< common GPIO port registers */
msp430_port_t base; /**< common GPIO port registers */
REG8 SEL; /**< alternative function select */
} msp_port_p3_p6_t;
} msp430_port_p3_p6_t;


/**
* @brief Timer interrupt status registers
*/
typedef struct {
REG16 TBIV; /**< TIMER_A interrupt status */
REG16 reserved[7]; /**< reserved */
REG16 reserved[7];/**< reserved */
REG16 TAIV; /**< TIMER_B interrupt status */
} msp_timer_ivec_t;
} msp430_timer_ivec_t;

/**
* @brief Timer module registers
Expand All @@ -126,7 +126,7 @@ typedef struct {
REG16 CCTL[7]; /**< capture compare channel control */
REG16 R; /**< current counter value */
REG16 CCR[7]; /**< capture compare channel values */
} msp_timer_t;
} msp430_timer_t;

/**
* @name MSP430 Common Peripheral Register Maps
Expand All @@ -138,42 +138,42 @@ typedef struct {
/**
* @brief Register map of GPIO PORT 1
*/
extern msp_port_p1_p2_t PORT_1;
extern msp430_port_p1_p2_t PORT_1;
/**
* @brief Register map of GPIO PORT 2
*/
extern msp_port_p1_p2_t PORT_2;
extern msp430_port_p1_p2_t PORT_2;
/**
* @brief Register map of GPIO PORT 3
*/
extern msp_port_p3_p6_t PORT_3;
extern msp430_port_p3_p6_t PORT_3;
/**
* @brief Register map of GPIO PORT 4
*/
extern msp_port_p3_p6_t PORT_4;
extern msp430_port_p3_p6_t PORT_4;
/**
* @brief Register map of GPIO PORT 5
*/
extern msp_port_p3_p6_t PORT_5;
extern msp430_port_p3_p6_t PORT_5;
/**
* @brief Register map of GPIO PORT 6
*/
extern msp_port_p3_p6_t PORT_6;
extern msp430_port_p3_p6_t PORT_6;

/**
* @brief Register map of the timer interrupt control registers
*/
extern msp_timer_ivec_t TIMER_IVEC;
extern msp430_timer_ivec_t TIMER_IVEC;

/**
* @brief Register map of the timer A control registers
*/
extern msp_timer_t TIMER_A;
extern msp430_timer_t TIMER_A;

/**
* @brief Register map of the timer B control registers
*/
extern msp_timer_t TIMER_B;
extern msp430_timer_t TIMER_B;
/** @} */

#ifdef __cplusplus
Expand Down
12 changes: 6 additions & 6 deletions cpu/msp430/include/x1xx/msp430_regs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ typedef struct {
REG8 BR1; /**< baud rate control 1 */
REG8 RXBUF; /**< receive buffer */
REG8 TXBUF; /**< transmit buffer */
} msp_usart_t;
} msp430_usart_t;

/**
* @brief USART Special Function Registers (SFR)
Expand All @@ -62,7 +62,7 @@ typedef struct {
REG8 IFG; /**< USART Interrupt Flag Register */
const uint8_t _pad2;/**< Padding */
REG8 ME; /**< Module Enable Register */
} msp_usart_sfr_t;
} msp430_usart_sfr_t;

/**
* @name USART clock selection
Expand All @@ -86,23 +86,23 @@ typedef struct {
/**
* @brief USART 0 SFR register map
*/
extern msp_usart_sfr_t USART_0_SFR;
extern msp430_usart_sfr_t USART_0_SFR;
/**
* @brief USART 1 SFR register map
*/
extern msp_usart_sfr_t USART_1_SFR;
extern msp430_usart_sfr_t USART_1_SFR;
/**
* @brief USART 0 register map
*
* @details The address is provided by the linker script
*/
extern msp_usart_t USART_0;
extern msp430_usart_t USART_0;
/**
* @brief USART 1 register map
*
* @details The address is provided by the linker script
*/
extern msp_usart_t USART_1;
extern msp430_usart_t USART_1;
/** @} */

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion cpu/msp430/ldscripts/msp430_common.ld
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ PROVIDE(PORT_4 = P4IN);
PROVIDE(PORT_5 = P5IN);
PROVIDE(PORT_6 = P6IN);

/* no typo: TBIV indeed comes before TAIV in memory, see msp_timer_ivec_t */
/* no typo: TBIV indeed comes before TAIV in memory, see msp430_timer_ivec_t */
PROVIDE(TIMER_IVEC = TBIV);

PROVIDE(TIMER_A = TACTL);
Expand Down
22 changes: 11 additions & 11 deletions cpu/msp430/periph/gpio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
*/
#define PINS_PER_PORT (8U)

static msp_port_t *_port(gpio_t pin)
static msp430_port_t *_port(gpio_t pin)
{
switch (pin >> 8) {
case 1:
Expand All @@ -59,11 +59,11 @@ static inline uint8_t _pin(gpio_t pin)
return (uint8_t)(pin & 0xff);
}

static inline msp_port_p1_p2_t *_isr_port(gpio_t pin)
static inline msp430_port_p1_p2_t *_isr_port(gpio_t pin)
{
/* checking for (pin >> 8) <= 2 requires 6 byte of .text more than
* checking the resulting address */
msp_port_p1_p2_t *port = container_of(_port(pin), msp_port_p1_p2_t, base);
msp430_port_p1_p2_t *port = container_of(_port(pin), msp430_port_p1_p2_t, base);
if ((port == &PORT_1) || (port == &PORT_2)) {
return port;
}
Expand All @@ -73,7 +73,7 @@ static inline msp_port_p1_p2_t *_isr_port(gpio_t pin)

int gpio_init(gpio_t pin, gpio_mode_t mode)
{
msp_port_t *port = _port(pin);
msp430_port_t *port = _port(pin);

/* check if port is valid and mode applicable */
if ((port == NULL) || ((mode != GPIO_IN) && (mode != GPIO_OUT))) {
Expand All @@ -94,12 +94,12 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
void gpio_periph_mode(gpio_t pin, bool enable)
{
REG8 *sel;
msp_port_p1_p2_t *isrport = _isr_port(pin);
msp430_port_p1_p2_t *isrport = _isr_port(pin);
if (isrport) {
sel = &(isrport->SEL);
}
else {
msp_port_p3_p6_t *port = container_of(_port(pin), msp_port_p3_p6_t, base);
msp430_port_p3_p6_t *port = container_of(_port(pin), msp430_port_p3_p6_t, base);
if (port) {
sel = &(port->SEL);
}
Expand All @@ -117,7 +117,7 @@ void gpio_periph_mode(gpio_t pin, bool enable)

int gpio_read(gpio_t pin)
{
msp_port_t *port = _port(pin);
msp430_port_t *port = _port(pin);
if (port->DIR & _pin(pin)) {
return (int)(port->OD & _pin(pin));
}
Expand Down Expand Up @@ -166,7 +166,7 @@ static int _ctx(gpio_t pin)
int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
gpio_cb_t cb, void *arg)
{
msp_port_p1_p2_t *port = _isr_port(pin);
msp430_port_p1_p2_t *port = _isr_port(pin);

/* check if port, pull resistor and flank configuration are valid */
if ((port == NULL) || (flank == GPIO_BOTH)) {
Expand All @@ -193,21 +193,21 @@ int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,

void gpio_irq_enable(gpio_t pin)
{
msp_port_p1_p2_t *port = _isr_port(pin);
msp430_port_p1_p2_t *port = _isr_port(pin);
if (port) {
port->IE |= _pin(pin);
}
}

void gpio_irq_disable(gpio_t pin)
{
msp_port_p1_p2_t *port = _isr_port(pin);
msp430_port_p1_p2_t *port = _isr_port(pin);
if (port) {
port->IE &= ~(_pin(pin));
}
}

static inline void isr_handler(msp_port_p1_p2_t *port, int ctx)
static inline void isr_handler(msp430_port_p1_p2_t *port, int ctx)
{
for (unsigned i = 0; i < PINS_PER_PORT; i++) {
if ((port->IE & (1 << i)) && (port->IFG & (1 << i))) {
Expand Down
6 changes: 3 additions & 3 deletions cpu/msp430/periph/uart_usart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ static int init_base(uart_t uart, uint32_t baudrate)
}

/* get the default UART for now -> TODO: enable for multiple devices */
msp_usart_t *dev = UART_BASE;
msp430_usart_t *dev = UART_BASE;

/* power off and reset device */
uart_poweroff(uart);
Expand All @@ -76,7 +76,7 @@ static int init_base(uart_t uart, uint32_t baudrate)
dev->MCTL = 0;
/* configure pins -> TODO: move into GPIO driver (once implemented) */
UART_PORT->SEL |= (UART_RX_PIN | UART_TX_PIN);
msp_port_t *port = &UART_PORT->base;
msp430_port_t *port = &UART_PORT->base;
port->OD |= UART_RX_PIN;
port->OD &= ~(UART_TX_PIN);
port->DIR |= UART_TX_PIN;
Expand All @@ -91,7 +91,7 @@ static int init_base(uart_t uart, uint32_t baudrate)
void uart_write(uart_t uart, const uint8_t *data, size_t len)
{
(void)uart;
msp_usart_t *dev = UART_BASE;
msp430_usart_t *dev = UART_BASE;

for (size_t i = 0; i < len; i++) {
while (!(dev->TCTL & TXEPT)) {}
Expand Down
2 changes: 1 addition & 1 deletion cpu/msp430/periph/uart_usci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ static int init_base(uart_t uart, uint32_t baudrate)
}

/* get the default UART for now -> TODO: enable for multiple devices */
msp_usci_a_t *dev = UART_BASE;
msp430_usci_a_t *dev = UART_BASE;

/* put device in reset mode while configuration is going on */
dev->CTL1 = UCSWRST;
Expand Down

0 comments on commit dd88935

Please sign in to comment.