From 95e74bc0d334f13f77a254ffd071ead900026797 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Sun, 13 Dec 2015 06:36:58 +0000 Subject: [PATCH] - fixed data types git-svn-id: http://moon:8086/svn/mips@59 a8ebac50-d88d-4704-bea3-6648445a41b3 --- src/test_gpio.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/test_gpio.c b/src/test_gpio.c index a8e095d..4868daf 100644 --- a/src/test_gpio.c +++ b/src/test_gpio.c @@ -55,11 +55,11 @@ void Time_print(void) void handler6(void) { - UINT32 i, num_bytes, num_words; + uint32_t i, num_bytes, num_words; - volatile UINT32 *pEmac_ctrl = (UINT32*)SYS_EMAC_RX_CTRL; - volatile UINT32 *pEmac_size = (UINT32*)SYS_EMAC_RX_SIZE; - volatile UINT32 *pEmac_data = (UINT32*)SYS_EMAC_DATA_CACHED; + volatile uint32_t *pEmac_ctrl = (uint32_t*)SYS_EMAC_RX_CTRL; + volatile uint32_t *pEmac_size = (uint32_t*)SYS_EMAC_RX_SIZE; + volatile uint32_t *pEmac_data = (uint32_t*)SYS_EMAC_DATA_CACHED; rx_descr_t rx_descr; if(EMAC_RX_is_avail()) @@ -194,21 +194,21 @@ int main() { uint16_t phy_reg; - UINT32 res, i, j, size, rx_pkt_cnt, rx_inv_pkt_cnt, tx_pkt_cnt, rx_byte_cnt, tx_byte_cnt; - volatile UINT32 *pEmac_rx_ctrl = (UINT32*)SYS_EMAC_RX_CTRL; - volatile UINT32 *pEmac_rx_size = (UINT32*)SYS_EMAC_RX_SIZE; - volatile UINT32 *pEmac_tx_ctrl = (UINT32*)SYS_EMAC_TX_CTRL; - volatile UINT32 *pEmac_tx_size = (UINT32*)SYS_EMAC_TX_SIZE; - volatile UINT32 *pEmac_data = (UINT32*)SYS_EMAC_DATA_CACHED; - volatile UINT32 *pEmac_maddr = (UINT32*)SYS_EMAC_MADDR; - volatile UINT8 *pEmac_maddr8 = (UINT8*)SYS_EMAC_MADDR; - UINT8 buffer[2048], data[1024]; + uint32_t res, i, j, size, rx_pkt_cnt, rx_inv_pkt_cnt, tx_pkt_cnt, rx_byte_cnt, tx_byte_cnt; + volatile uint32_t *pEmac_rx_ctrl = (uint32_t*)SYS_EMAC_RX_CTRL; + volatile uint32_t *pEmac_rx_size = (uint32_t*)SYS_EMAC_RX_SIZE; + volatile uint32_t *pEmac_tx_ctrl = (uint32_t*)SYS_EMAC_TX_CTRL; + volatile uint32_t *pEmac_tx_size = (uint32_t*)SYS_EMAC_TX_SIZE; + volatile uint32_t *pEmac_data = (uint32_t*)SYS_EMAC_DATA_CACHED; + volatile uint32_t *pEmac_maddr = (uint32_t*)SYS_EMAC_MADDR; + volatile uint8_t *pEmac_maddr8 = (uint8_t*)SYS_EMAC_MADDR; + uint8_t buffer[2048], data[1024]; packet_t packet; ARP *pARP; IPV4 *pIPV4; UDP *pUDP; DHCP *pDHCP; - UINT32 start, stop; + uint32_t start, stop; rx_descr_t rx_descr; gpio_init(&gpio, SYS_GPIO_0_BASE); @@ -326,7 +326,7 @@ int main() printf("Packet %d\n", rx_pkt_cnt); printf("---------------------------------------------------------------\n"); printf("RX data (%d bytes):\n", rx_descr.size); - PrintBuffer8((UINT8*)rx_descr.pBuf, 16, rx_descr.size); + PrintBuffer8((uint8_t*)rx_descr.pBuf, 16, rx_descr.size); printf("\n"); printf("Total : %.2f kbyte\n", rx_pkt_cnt, (double)rx_byte_cnt/(1024));