summaryrefslogtreecommitdiff
path: root/bsp/tm4c129x/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'bsp/tm4c129x/drivers')
-rw-r--r--bsp/tm4c129x/drivers/drv_eth.c54
-rw-r--r--bsp/tm4c129x/drivers/drv_eth.h2
-rw-r--r--bsp/tm4c129x/drivers/drv_uart.c142
3 files changed, 99 insertions, 99 deletions
diff --git a/bsp/tm4c129x/drivers/drv_eth.c b/bsp/tm4c129x/drivers/drv_eth.c
index 15c469989d..12d9f88f3e 100644
--- a/bsp/tm4c129x/drivers/drv_eth.c
+++ b/bsp/tm4c129x/drivers/drv_eth.c
@@ -242,7 +242,7 @@ volatile uint32_t g_ui32AbnormalInts;
((uint32_t)(ptr) < 0x20070000))
-typedef struct
+typedef struct
{
/* inherit from ethernet device */
struct eth_device parent;
@@ -250,7 +250,7 @@ typedef struct
/* for rx_thread async get pbuf */
rt_mailbox_t rx_pbuf_mb;
} net_device;
-typedef net_device* net_device_t;
+typedef net_device* net_device_t;
static char rx_pbuf_mb_pool[8*4];
static struct rt_mailbox eth_rx_pbuf_mb;
@@ -566,7 +566,7 @@ tivaif_transmit(net_device_t dev, struct pbuf *p)
/* Get our state data from the netif structure we were passed. */
//pIF = (tStellarisIF *)psNetif->state;
pIF = dev->dma_if;
-
+
/* Make sure that the transmit descriptors are not all in use */
pDesc = &(pIF->pTxDescList->pDescriptors[pIF->pTxDescList->ui32Write]);
if(pDesc->pBuf)
@@ -951,7 +951,7 @@ tivaif_process_phy_interrupt(net_device_t dev)
*/
ui16Val = EMACPHYRead(EMAC0_BASE, PHY_PHYS_ADDR, EPHY_MISR1);
- /*
+ /*
* Dummy read PHY REG EPHY_BMSR, it will force update the EPHY_STS register
*/
EMACPHYRead(EMAC0_BASE, PHY_PHYS_ADDR, EPHY_BMSR);
@@ -1166,38 +1166,38 @@ void lwIPEthernetIntHandler(void)
}
-// OUI:00-12-37 (hex) Texas Instruments, only for test
+// OUI:00-12-37 (hex) Texas Instruments, only for test
static int tiva_eth_mac_addr_init(void)
{
- int retVal =0;
+ int retVal =0;
uint32_t ulUser[2];
uint8_t mac_addr[6];
-
+
MAP_FlashUserGet(&ulUser[0], &ulUser[1]);
if((ulUser[0] == 0xffffffff) || (ulUser[1] == 0xffffffff))
{
rt_kprintf("Fail to get mac address from eeprom.\n");
rt_kprintf("Using default mac address\n");
- // OUI:00-12-37 (hex) Texas Instruments, only for test
- // Configure the hardware MAC address
+ // OUI:00-12-37 (hex) Texas Instruments, only for test
+ // Configure the hardware MAC address
ulUser[0] = 0x00371200;
ulUser[1] = 0x00563412;
- //FlashUserSet(ulUser0, ulUser1);
+ //FlashUserSet(ulUser0, ulUser1);
retVal =-1;
}
-
-
+
+
//Convert the 24/24 split MAC address from NV ram into a 32/16 split MAC
//address needed to program the hardware registers, then program the MAC
//address into the Ethernet Controller registers.
-
+
mac_addr[0] = ((ulUser[0] >> 0) & 0xff);
mac_addr[1] = ((ulUser[0] >> 8) & 0xff);
mac_addr[2] = ((ulUser[0] >> 16) & 0xff);
mac_addr[3] = ((ulUser[1] >> 0) & 0xff);
mac_addr[4] = ((ulUser[1] >> 8) & 0xff);
mac_addr[5] = ((ulUser[1] >> 16) & 0xff);
-
+
//
// Program the hardware with its MAC address (for filtering).
//
@@ -1215,7 +1215,7 @@ static int tiva_eth_mac_addr_init(void)
MAP_GPIOPinConfigure(GPIO_PF4_EN0LED1);
GPIOPinTypeEthernetLED(GPIO_PORTF_BASE, GPIO_PIN_0);
GPIOPinTypeEthernetLED(GPIO_PORTF_BASE, GPIO_PIN_4);
-
+
//
// Enable the ethernet peripheral.
//
@@ -1284,7 +1284,7 @@ static int tiva_eth_mac_addr_init(void)
EMAC_MODE_TX_STORE_FORWARD |
EMAC_MODE_TX_THRESHOLD_64_BYTES |
EMAC_MODE_RX_THRESHOLD_64_BYTES), 0);
-
+
EMACIntRegister(EMAC0_BASE, lwIPEthernetIntHandler);
}
@@ -1293,7 +1293,7 @@ static rt_err_t eth_dev_init(rt_device_t device)
{
net_device_t net_dev = (net_device_t)device;
struct netif *psNetif = (net_dev->parent.netif);
-
+
LWIP_ASSERT("psNetif != NULL", (psNetif != NULL));
#if LWIP_NETIF_HOSTNAME
@@ -1307,7 +1307,7 @@ static rt_err_t eth_dev_init(rt_device_t device)
* of bits per second.
*/
//NETIF_INIT_SNMP(psNetif, snmp_ifType_ethernet_csmacd, 1000000);
-
+
net_dev->dma_if = &g_StellarisIFData;
/* Remember our MAC address. */
@@ -1325,9 +1325,9 @@ static rt_err_t eth_dev_control(rt_device_t dev, int cmd, void *args)
{
case NIOCTL_GADDR:
/* get mac address */
- if(args)
+ if(args)
MAP_EMACAddrGet(EMAC0_BASE, 0, (uint8_t*)args);
- else
+ else
return -RT_ERROR;
break;
@@ -1375,7 +1375,7 @@ static struct pbuf* eth_dev_rx(rt_device_t dev)
rt_uint32_t temp =0;
net_device_t net_dev = (net_device_t)dev;
result = rt_mb_recv(net_dev->rx_pbuf_mb, (rt_ubase_t *)&temp, RT_WAITING_NO);
-
+
return (result == RT_EOK)? (struct pbuf*)temp : RT_NULL;
}
@@ -1384,7 +1384,7 @@ int rt_hw_tiva_eth_init(void)
rt_err_t result;
/* Clock GPIO and etc */
- tiva_eth_lowlevel_init();
+ tiva_eth_lowlevel_init();
tiva_eth_mac_addr_init();
/* init rt-thread device interface */
@@ -1396,14 +1396,14 @@ int rt_hw_tiva_eth_init(void)
eth_dev->parent.parent.control = eth_dev_control;
eth_dev->parent.eth_rx = eth_dev_rx;
eth_dev->parent.eth_tx = eth_dev_tx;
-
+
result = rt_mb_init(&eth_rx_pbuf_mb, "epbuf",
&rx_pbuf_mb_pool[0], sizeof(rx_pbuf_mb_pool)/4,
RT_IPC_FLAG_FIFO);
RT_ASSERT(result == RT_EOK);
eth_dev->rx_pbuf_mb = &eth_rx_pbuf_mb;
-
-
+
+
result = eth_device_init(&(eth_dev->parent), "e0");
return result;
}
@@ -1429,13 +1429,13 @@ void PHY_Write(uint8_t addr , uint16_t data)
}
FINSH_FUNCTION_EXPORT(PHY_Write, (add, data));
-void PHY_SetAdd(uint8_t addr0, uint8_t addr1, uint8_t addr2,
+void PHY_SetAdd(uint8_t addr0, uint8_t addr1, uint8_t addr2,
uint8_t addr3, uint8_t addr4, uint8_t addr5)
{
uint32_t ulUser[2];
ulUser[0] = (((addr2<<8)|addr1)<<8)|addr0;
ulUser[1] = (((addr5<<8)|addr4)<<8)|addr3;
-
+
MAP_FlashUserSet(ulUser[0], ulUser[1]);
MAP_FlashUserSave();
rt_kprintf("Save to EEPROM. please reboot.");
diff --git a/bsp/tm4c129x/drivers/drv_eth.h b/bsp/tm4c129x/drivers/drv_eth.h
index 3c2fefefbf..2fa81e4f04 100644
--- a/bsp/tm4c129x/drivers/drv_eth.h
+++ b/bsp/tm4c129x/drivers/drv_eth.h
@@ -7,7 +7,7 @@
* Date Author Notes
* 2014-07-25 ArdaFu Port to TM4C129X
*/
-
+
#ifndef __TIVA_ETH_H__
#define __TIVA_ETH_H__
diff --git a/bsp/tm4c129x/drivers/drv_uart.c b/bsp/tm4c129x/drivers/drv_uart.c
index 4b7ca48e6e..d1b26f3002 100644
--- a/bsp/tm4c129x/drivers/drv_uart.c
+++ b/bsp/tm4c129x/drivers/drv_uart.c
@@ -30,75 +30,75 @@ typedef struct hw_uart_device
#define mUartGetHwPtr(serial) ((hw_uart_t*)(serial->parent.user_data))
static rt_err_t hw_configure(struct rt_serial_device *serial, struct serial_configure *cfg)
-{
- uint32_t config = 0;
- hw_uart_t* uart;
+{
+ uint32_t config = 0;
+ hw_uart_t* uart;
RT_ASSERT(serial != RT_NULL);
uart = mUartGetHwPtr(serial);
- MAP_UARTDisable(uart->hw_base);
- // build UART Configuration parameter structure
+ MAP_UARTDisable(uart->hw_base);
+ // build UART Configuration parameter structure
switch(cfg->data_bits)
- {
- case DATA_BITS_9:
- // enable 9bit address mode and set DATA_BIT_8
- MAP_UART9BitEnable(uart->hw_base);
- case DATA_BITS_8:
- config |= UART_CONFIG_WLEN_8;
- break;
- case DATA_BITS_7:
- config |= UART_CONFIG_WLEN_7;
- break;
- case DATA_BITS_6:
- config |= UART_CONFIG_WLEN_6;
- break;
- case DATA_BITS_5:
- config |= UART_CONFIG_WLEN_5;
- break;
- default:
- RT_ASSERT(0);
- break;
- }
- switch(cfg->parity)
- {
- case PARITY_ODD:
- config |= UART_CONFIG_PAR_ODD;
- break;
- case PARITY_EVEN:
- config |= UART_CONFIG_PAR_EVEN;
- break;
- case PARITY_NONE:
- config |= UART_CONFIG_PAR_NONE;
- break;
- default:
- RT_ASSERT(0);
- break;
- }
- switch(cfg->stop_bits)
- {
- case STOP_BITS_1:
- config |= UART_CONFIG_STOP_ONE;
- break;
- case STOP_BITS_2:
- config |= UART_CONFIG_STOP_TWO;
- break;
- default:
- RT_ASSERT(0);
- break;
- }
-
- // Initialize UART0 peripheral with given to corresponding parameter
+ {
+ case DATA_BITS_9:
+ // enable 9bit address mode and set DATA_BIT_8
+ MAP_UART9BitEnable(uart->hw_base);
+ case DATA_BITS_8:
+ config |= UART_CONFIG_WLEN_8;
+ break;
+ case DATA_BITS_7:
+ config |= UART_CONFIG_WLEN_7;
+ break;
+ case DATA_BITS_6:
+ config |= UART_CONFIG_WLEN_6;
+ break;
+ case DATA_BITS_5:
+ config |= UART_CONFIG_WLEN_5;
+ break;
+ default:
+ RT_ASSERT(0);
+ break;
+ }
+ switch(cfg->parity)
+ {
+ case PARITY_ODD:
+ config |= UART_CONFIG_PAR_ODD;
+ break;
+ case PARITY_EVEN:
+ config |= UART_CONFIG_PAR_EVEN;
+ break;
+ case PARITY_NONE:
+ config |= UART_CONFIG_PAR_NONE;
+ break;
+ default:
+ RT_ASSERT(0);
+ break;
+ }
+ switch(cfg->stop_bits)
+ {
+ case STOP_BITS_1:
+ config |= UART_CONFIG_STOP_ONE;
+ break;
+ case STOP_BITS_2:
+ config |= UART_CONFIG_STOP_TWO;
+ break;
+ default:
+ RT_ASSERT(0);
+ break;
+ }
+
+ // Initialize UART0 peripheral with given to corresponding parameter
MAP_UARTConfigSetExpClk(uart->hw_base, SystemCoreClock, cfg->baud_rate, config);
- MAP_UARTFIFOEnable(uart->hw_base);
+ MAP_UARTFIFOEnable(uart->hw_base);
- // Enable the UART.
- MAP_UARTEnable(uart->hw_base);
+ // Enable the UART.
+ MAP_UARTEnable(uart->hw_base);
return RT_EOK;
}
static rt_err_t hw_control(struct rt_serial_device *serial, int cmd, void *arg)
{
- hw_uart_t* uart;
+ hw_uart_t* uart;
RT_ASSERT(serial != RT_NULL);
uart = mUartGetHwPtr(serial);
@@ -119,21 +119,21 @@ static rt_err_t hw_control(struct rt_serial_device *serial, int cmd, void *arg)
static int hw_putc(struct rt_serial_device *serial, char c)
{
- hw_uart_t* uart;
+ hw_uart_t* uart;
RT_ASSERT(serial != RT_NULL);
uart = mUartGetHwPtr(serial);
-
+
MAP_UARTCharPut(uart->hw_base, *((uint8_t *)&c));
return 1;
}
static int hw_getc(struct rt_serial_device *serial)
{
- hw_uart_t* uart;
+ hw_uart_t* uart;
RT_ASSERT(serial != RT_NULL);
uart = mUartGetHwPtr(serial);
-
- return MAP_UARTCharGetNonBlocking(uart->hw_base);
+
+ return MAP_UARTCharGetNonBlocking(uart->hw_base);
}
static const struct rt_uart_ops hw_uart_ops =
@@ -154,7 +154,7 @@ hw_uart_t uart0 =
void UART0_IRQHandler(void)
{
- uint32_t intsrc;
+ uint32_t intsrc;
hw_uart_t *uart = &uart0;
/* enter interrupt */
@@ -169,7 +169,7 @@ void UART0_IRQHandler(void)
MAP_UARTIntClear(uart->hw_base, intsrc);
rt_hw_serial_isr(&serial0, RT_SERIAL_EVENT_RX_IND);
}
-
+
/* leave interrupt */
rt_interrupt_leave();
}
@@ -187,7 +187,7 @@ int rt_hw_uart_init(void)
config.stop_bits = STOP_BITS_1;
config.invert = NRZ_NORMAL;
config.bufsz = RT_SERIAL_RB_BUFSZ;
-
+
#ifdef RT_USING_UART0
uart = &uart0;
serial0.ops = &hw_uart_ops;
@@ -196,7 +196,7 @@ int rt_hw_uart_init(void)
MAP_SysCtlPeripheralEnable(SYSCTL_PERIPH_GPIOA);
MAP_GPIOPinConfigure(GPIO_PA0_U0RX);
MAP_GPIOPinConfigure(GPIO_PA1_U0TX);
-
+
MAP_GPIOPinTypeUART(GPIO_PORTA_BASE, GPIO_PIN_0 | GPIO_PIN_1);
MAP_SysCtlPeripheralEnable(SYSCTL_PERIPH_UART0);
@@ -204,15 +204,15 @@ int rt_hw_uart_init(void)
//IntPrioritySet(INT_UART0, ((0x01 << 5) | 0x01));
/* Enable Interrupt for UART channel */
- UARTIntRegister(uart->hw_base, UART0_IRQHandler);
- MAP_IntEnable(INT_UART0);
- MAP_UARTEnable(uart->hw_base);
+ UARTIntRegister(uart->hw_base, UART0_IRQHandler);
+ MAP_IntEnable(INT_UART0);
+ MAP_UARTEnable(uart->hw_base);
/* register UART0 device */
rt_hw_serial_register(&serial0, "uart0",
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX,
uart);
#endif
- return 0;
+ return 0;
}
INIT_BOARD_EXPORT(rt_hw_uart_init);
generated by cgit v1.3.1 (git 2.54.0) at 2026-10-24 17:22:01 +0000