diff --git a/bsp/at91sam9260/macb.c b/bsp/at91sam9260/macb.c index 7c77d6137f..293a0662db 100755 --- a/bsp/at91sam9260/macb.c +++ b/bsp/at91sam9260/macb.c @@ -37,16 +37,54 @@ extern void mmu_invalidate_dcache(rt_uint32_t buffer, rt_uint32_t size); #define BD_CACHE_WRITEBACK(addr, size) #define BD_CACHE_WRITEBACK_INVALIDATE(addr, size) +/* EMAC internal utility function */ +rt_inline unsigned long emac_virt_to_phys(unsigned long addr) +{ + return addr; +} -#define CONFIG_RMII -#define MACB_RX_BUFFER_SIZE 4096*4 -#define MACB_RX_RING_SIZE (MACB_RX_BUFFER_SIZE / 128) +#define AT91SAM9260_SRAM0_VIRT_BASE (0x90000000) + +#define MACB_TX_SRAM + +#if defined(MACB_TX_SRAM) +#define MACB_TX_RING_SIZE 2 +#define MACB_TX_BUFFER_SIZE (1536 * MACB_TX_RING_SIZE) +#define TX_RING_BYTES (sizeof(struct macb_dma_desc) * MACB_TX_RING_SIZE) +#else #define MACB_TX_RING_SIZE 16 +#define MACB_TX_BUFFER_SIZE (1536 * MACB_TX_RING_SIZE) +#endif + +#define MACB_RX_BUFFER_SIZE (4096*4) +#define MACB_RX_RING_SIZE (MACB_RX_BUFFER_SIZE / 128) + +#define DEF_TX_RING_PENDING (MACB_TX_RING_SIZE) + +#define TX_RING_GAP(macb) \ + (MACB_TX_RING_SIZE - (macb)->tx_pending) + +#define TX_BUFFS_AVAIL(macb) \ + (((macb)->tx_tail <= (macb)->tx_head) ? \ + (macb)->tx_tail + (macb)->tx_pending - (macb)->tx_head : \ + (macb)->tx_tail - (macb)->tx_head - TX_RING_GAP(macb)) + +#define NEXT_TX(n) (((n) + 1) & (MACB_TX_RING_SIZE - 1)) + +#define NEXT_RX(n) (((n) + 1) & (MACB_RX_RING_SIZE - 1)) + +/* minimum number of free TX descriptors before waking up TX process */ +#define MACB_TX_WAKEUP_THRESH (MACB_TX_RING_SIZE / 4) + +#define MACB_RX_INT_FLAGS (MACB_BIT(RCOMP) | MACB_BIT(RXUBR) \ + | MACB_BIT(ISR_ROVR)) + #define MACB_TX_TIMEOUT 1000 #define MACB_AUTONEG_TIMEOUT 5000000 -#define MACB_LINK_TIMEOUT 500000 +#define MACB_LINK_TIMEOUT 500000 +#define CONFIG_RMII struct macb_dma_desc { rt_uint32_t addr; @@ -75,9 +113,6 @@ struct macb_dma_desc { #define TXBUF_WRAP 0x40000000 #define TXBUF_USED 0x80000000 -#define MACB_RX_INT_FLAGS (MACB_BIT(RCOMP) | MACB_BIT(RXUBR) \ - | MACB_BIT(ISR_ROVR)) - /* Duplex, half or full. */ #define DUPLEX_HALF 0x00 #define DUPLEX_FULL 0x01 @@ -93,6 +128,8 @@ struct rt_macb_eth unsigned int rx_tail; unsigned int tx_head; unsigned int tx_tail; + unsigned int rx_pending; + unsigned int tx_pending; void *rx_buffer; void *tx_buffer; @@ -100,21 +137,28 @@ struct rt_macb_eth struct macb_dma_desc *tx_ring; unsigned long rx_buffer_dma; + unsigned long tx_buffer_dma; unsigned long rx_ring_dma; unsigned long tx_ring_dma; + unsigned int tx_stop; + /* interface address info. */ rt_uint8_t dev_addr[MAX_ADDR_LEN]; /* hw address */ unsigned short phy_addr; struct rt_semaphore mdio_bus_lock; + struct rt_semaphore tx_lock; + struct rt_semaphore rx_lock; + struct rt_semaphore tx_ack; rt_uint32_t speed; rt_uint32_t duplex; rt_uint32_t link; struct rt_timer timer; }; static struct rt_macb_eth macb_device; -static struct rt_semaphore sem_ack, sem_lock; + +static void macb_tx(struct rt_macb_eth *macb); static void udelay(rt_uint32_t us) { @@ -133,7 +177,8 @@ static void rt_macb_isr(int irq, void *param) while (status) { - if (status & MACB_RX_INT_FLAGS) { + if (status & MACB_RX_INT_FLAGS) + { rsr = macb_readl(macb, RSR); macb_writel(macb, RSR, rsr); /* a frame has been received */ @@ -144,10 +189,7 @@ static void rt_macb_isr(int irq, void *param) if (status & (MACB_BIT(TCOMP) | MACB_BIT(ISR_TUND) | MACB_BIT(ISR_RLE))) { - tsr = macb_readl(macb, TSR); - macb_writel(macb, TSR, tsr); - /* One packet sent complete */ - rt_sem_release(&sem_ack); + macb_tx(macb); } /* @@ -155,7 +197,8 @@ static void rt_macb_isr(int irq, void *param) * add that if/when we get our hands on a full-blown MII PHY. */ - if (status & MACB_BIT(HRESP)) { + if (status & MACB_BIT(HRESP)) + { /* * TODO: Reset the hardware, and maybe move the printk * to a lower-priority context as well (work queue?) @@ -243,7 +286,8 @@ static void macb_phy_reset(rt_device_t dev) macb_mdio_write(macb, MII_BMCR, (BMCR_ANENABLE | BMCR_ANRESTART)); - for (i = 0; i < MACB_AUTONEG_TIMEOUT / 100; i++) { + for (i = 0; i < MACB_AUTONEG_TIMEOUT / 100; i++) + { status = macb_mdio_read(macb, MII_BMSR); if (status & BMSR_ANEGCOMPLETE) break; @@ -268,17 +312,20 @@ static int macb_phy_init(rt_device_t dev) /* Check if the PHY is up to snuff... */ phy_id = macb_mdio_read(macb, MII_PHYSID1); - if (phy_id == 0xffff) { + if (phy_id == 0xffff) + { rt_kprintf("%s: No PHY present\n", dev->parent.name); return 0; } status = macb_mdio_read(macb, MII_BMSR); - if (!(status & BMSR_LSTATUS)) { + if (!(status & BMSR_LSTATUS)) + { /* Try to re-negotiate if we don't have link already. */ macb_phy_reset(dev); - for (i = 0; i < MACB_LINK_TIMEOUT / 100; i++) { + for (i = 0; i < MACB_LINK_TIMEOUT / 100; i++) + { status = macb_mdio_read(macb, MII_BMSR); if (status & BMSR_LSTATUS) break; @@ -286,11 +333,14 @@ static int macb_phy_init(rt_device_t dev) } } - if (!(status & BMSR_LSTATUS)) { + if (!(status & BMSR_LSTATUS)) + { rt_kprintf("%s: link down (status: 0x%04x)\n", dev->parent.name, status); return 0; - } else { + } + else + { adv = macb_mdio_read(macb, MII_ADVERTISE); lpa = macb_mdio_read(macb, MII_LPA); media = mii_nway_result(lpa & adv); @@ -338,13 +388,16 @@ void macb_update_link(void *param) else link = 1; - if (link != macb->link) { + if (link != macb->link) + { macb->link = link; status_change = 1; } - if (status_change) { - if (macb->link) { + if (status_change) + { + if (macb->link) + { adv = macb_mdio_read(macb, MII_ADVERTISE); lpa = macb_mdio_read(macb, MII_LPA); media = mii_nway_result(lpa & adv); @@ -355,7 +408,9 @@ void macb_update_link(void *param) dev->parent.name, macb->speed, DUPLEX_FULL == macb->duplex ? "Full":"Half"); eth_device_linkchange(&macb->parent, RT_TRUE); - } else { + } + else + { rt_kprintf("%s: link down\n", dev->parent.name); eth_device_linkchange(&macb->parent, RT_FALSE); } @@ -382,19 +437,23 @@ static rt_err_t rt_macb_init(rt_device_t dev) /* initialize DMA descriptors */ paddr = macb->rx_buffer_dma; - for (i = 0; i < MACB_RX_RING_SIZE; i++) { + for (i = 0; i < MACB_RX_RING_SIZE; i++) + { if (i == (MACB_RX_RING_SIZE - 1)) paddr |= RXADDR_WRAP; macb->rx_ring[i].addr = paddr; macb->rx_ring[i].ctrl = 0; paddr += 128; } - for (i = 0; i < MACB_TX_RING_SIZE; i++) { - macb->tx_ring[i].addr = 0; + paddr = macb->tx_buffer_dma; + for (i = 0; i < MACB_TX_RING_SIZE; i++) + { + macb->tx_ring[i].addr = paddr; if (i == (MACB_TX_RING_SIZE - 1)) macb->tx_ring[i].ctrl = TXBUF_USED | TXBUF_WRAP; else macb->tx_ring[i].ctrl = TXBUF_USED; + paddr += 1536; } macb->rx_tail = macb->tx_head = macb->tx_tail = 0; @@ -488,31 +547,127 @@ static rt_err_t rt_macb_control(rt_device_t dev, rt_uint8_t cmd, void *args) return RT_EOK; } +static void macb_tx(struct rt_macb_eth *macb) +{ + unsigned int tail; + unsigned int head; + rt_uint32_t status; + + status = macb_readl(macb, TSR); + macb_writel(macb, TSR, status); + + /*rt_kprintf("macb_tx status = %02lx\n", + (unsigned long)status);*/ + + if (status & (MACB_BIT(UND) | MACB_BIT(TSR_RLE))) + { + int i; + rt_kprintf("%s: TX %s, resetting buffers\n", + macb->parent.parent.parent.name, status & MACB_BIT(UND) ? + "underrun" : "retry limit exceeded"); + + /* Transfer ongoing, disable transmitter, to avoid confusion */ + if (status & MACB_BIT(TGO)) + macb_writel(macb, NCR, macb_readl(macb, NCR) & ~MACB_BIT(TE)); + + head = macb->tx_head; + + /*Mark all the buffer as used to avoid sending a lost buffer*/ + for (i = 0; i < MACB_TX_RING_SIZE; i++) + macb->tx_ring[i].ctrl = MACB_BIT(TX_USED); + + /* free transmit buffer in upper layer*/ + + macb->tx_head = macb->tx_tail = 0; + + /* Enable the transmitter again */ + if (status & MACB_BIT(TGO)) + macb_writel(macb, NCR, macb_readl(macb, NCR) | MACB_BIT(TE)); + } + + if (!(status & MACB_BIT(COMP))) + /* + * This may happen when a buffer becomes complete + * between reading the ISR and scanning the + * descriptors. Nothing to worry about. + */ + return; + + head = macb->tx_head; + for (tail = macb->tx_tail; tail != head; tail = NEXT_TX(tail)) + { + rt_uint32_t bufstat; + + bufstat = macb->tx_ring[tail].ctrl; + + if (!(bufstat & MACB_BIT(TX_USED))) + break; + } + + macb->tx_tail = tail; + if ((macb->tx_stop == 1) && + TX_BUFFS_AVAIL(macb) > MACB_TX_WAKEUP_THRESH) + rt_sem_release(&macb->tx_ack); +} + + /* ethernet device interface */ /* transmit packet. */ rt_err_t rt_macb_tx( rt_device_t dev, struct pbuf* p) { unsigned long ctrl; + struct pbuf* q; + rt_uint8_t* bufptr; + rt_uint32_t mapping; struct rt_macb_eth *macb = dev->user_data; unsigned int tx_head = macb->tx_head; - rt_sem_take(&sem_lock, RT_WAITING_FOREVER); - EMAC_CACHE_WRITEBACK(p->payload, p->tot_len); + rt_sem_take(&macb->tx_lock, RT_WAITING_FOREVER); + if (TX_BUFFS_AVAIL(macb) < 1) + { + rt_sem_release(&macb->tx_lock); + rt_kprintf("Tx Ring full!\n"); + rt_kprintf("tx_head = %u, tx_tail = %u\n", + macb->tx_head, macb->tx_tail); + return -RT_ERROR; + } + + macb->tx_stop = 0; + ctrl = p->tot_len & TXBUF_FRMLEN_MASK; ctrl |= TXBUF_FRAME_END; - if (tx_head == (MACB_TX_RING_SIZE - 1)) { + if (tx_head == (MACB_TX_RING_SIZE - 1)) + { ctrl |= TXBUF_WRAP; - macb->tx_head = 0; - } else - macb->tx_head++; - macb->tx_ring[tx_head].ctrl = ctrl; - macb->tx_ring[tx_head].addr = (rt_uint32_t)p->payload; - BD_CACHE_WRITEBACK_INVALIDATE(macb->tx_ring[tx_head], sizeof(struct macb_dma_desc)); - macb_writel(macb, NCR, MACB_BIT(TE) | MACB_BIT(RE) | MACB_BIT(TSTART)); + } +#if defined(MACB_TX_SRAM) + bufptr = macb->tx_buffer + tx_head * 1536; +#else + mapping = (unsigned long)macb->tx_buffer + tx_head * 1536; + bufptr = (rt_uint8_t *)mapping; +#endif - rt_sem_release(&sem_lock); - /* wait ack */ - rt_sem_take(&sem_ack, RT_WAITING_FOREVER); + for (q = p; q != NULL; q = q->next) + { + memcpy(bufptr, q->payload, q->len); + bufptr += q->len; + } +#if !defined(MACB_TX_SRAM) + EMAC_CACHE_WRITEBACK(mapping, p->tot_len); +#endif + macb->tx_ring[tx_head].ctrl = ctrl; + BD_CACHE_WRITEBACK_INVALIDATE(&macb->tx_ring[tx_head], sizeof(struct macb_dma_desc)); + tx_head = NEXT_TX(tx_head); + macb->tx_head = tx_head; + macb_writel(macb, NCR, macb_readl(macb, NCR) | MACB_BIT(TSTART)); + macb_writel(macb, NCR, macb_readl(macb, NCR) | MACB_BIT(TSTART)); + + if (TX_BUFFS_AVAIL(macb) < 1) + { + macb->tx_stop = 1; + rt_sem_take(&macb->tx_ack, RT_WAITING_FOREVER); + } + rt_sem_release(&macb->tx_lock); return RT_EOK; } @@ -523,14 +678,16 @@ static void reclaim_rx_buffers(struct rt_macb_eth *macb, unsigned int i; i = macb->rx_tail; - while (i > new_tail) { + while (i > new_tail) + { macb->rx_ring[i].addr &= ~RXADDR_USED; i++; if (i > MACB_RX_RING_SIZE) i = 0; } - while (i < new_tail) { + while (i < new_tail) + { macb->rx_ring[i].addr &= ~RXADDR_USED; i++; } @@ -549,19 +706,22 @@ struct pbuf *rt_macb_rx(rt_device_t dev) int wrapped = 0; rt_uint32_t status; - rt_sem_take(&sem_lock, RT_WAITING_FOREVER); - for (;;) { + rt_sem_take(&macb->rx_lock, RT_WAITING_FOREVER); + for (;;) + { if (!(macb->rx_ring[rx_tail].addr & RXADDR_USED)) break; status = macb->rx_ring[rx_tail].ctrl; - if (status & RXBUF_FRAME_START) { + if (status & RXBUF_FRAME_START) + { if (rx_tail != macb->rx_tail) reclaim_rx_buffers(macb, rx_tail); wrapped = 0; } - if (status & RXBUF_FRAME_END) { + if (status & RXBUF_FRAME_END) + { buffer = (void *)((unsigned int)macb->rx_buffer + 128 * macb->rx_tail); len = status & RXBUF_FRMLEN_MASK; p = pbuf_alloc(PBUF_LINK, len, PBUF_RAM); @@ -570,7 +730,8 @@ struct pbuf *rt_macb_rx(rt_device_t dev) rt_kprintf("alloc pbuf failed\n"); break; } - if (wrapped) { + if (wrapped) + { unsigned int headlen, taillen; headlen = 128 * (MACB_RX_RING_SIZE @@ -581,7 +742,9 @@ struct pbuf *rt_macb_rx(rt_device_t dev) memcpy((void *)p->payload, buffer, headlen); memcpy((void *)((unsigned int)p->payload + headlen), macb->rx_buffer, taillen); - } else { + } + else + { EMAC_CACHE_INVALIDATE(buffer, len); memcpy((void *)p->payload, buffer, p->len); } @@ -590,15 +753,18 @@ struct pbuf *rt_macb_rx(rt_device_t dev) rx_tail = 0; reclaim_rx_buffers(macb, rx_tail); break; - } else { - if (++rx_tail >= MACB_RX_RING_SIZE) { + } + else + { + if (++rx_tail >= MACB_RX_RING_SIZE) + { wrapped = 1; rx_tail = 0; } } } - rt_sem_release(&sem_lock); + rt_sem_release(&macb->rx_lock); return p; } @@ -615,25 +781,42 @@ void macb_gpio_init() #endif } -void macb_initialize() +rt_err_t macb_initialize() { struct rt_macb_eth *macb = &macb_device; unsigned long macb_hz; rt_uint32_t ncfgr; - macb->rx_buffer = rt_malloc(MACB_RX_BUFFER_SIZE); - macb->rx_ring = rt_malloc(MACB_RX_RING_SIZE * sizeof(struct macb_dma_desc)); - macb->tx_ring = rt_malloc(MACB_TX_RING_SIZE * sizeof(struct macb_dma_desc)); - - EMAC_CACHE_INVALIDATE(macb->rx_ring, MACB_RX_RING_SIZE * sizeof(struct macb_dma_desc)); +#if defined(MACB_TX_SRAM) + macb->tx_ring_dma = AT91SAM9260_SRAM0_BASE; + macb->tx_ring = (struct macb_dma_desc *)AT91SAM9260_SRAM0_VIRT_BASE; + macb->tx_buffer = (char *) macb->tx_ring + TX_RING_BYTES; + macb->tx_buffer_dma = macb->tx_ring_dma + TX_RING_BYTES; +#else + macb->tx_ring = rt_malloc(MACB_RX_RING_SIZE * sizeof(struct macb_dma_desc)); + if (macb->tx_ring == RT_NULL) + goto err1; EMAC_CACHE_INVALIDATE(macb->tx_ring, MACB_TX_RING_SIZE * sizeof(struct macb_dma_desc)); + macb->tx_ring_dma = emac_virt_to_phys((unsigned long)macb->tx_ring); + macb->tx_ring = (struct macb_dma_desc *)MMU_NOCACHE_ADDR((unsigned long)macb->tx_ring); + macb->tx_buffer = rt_malloc(MACB_TX_BUFFER_SIZE); + if (macb->tx_buffer == RT_NULL) + goto err2; + macb->tx_buffer_dma = emac_virt_to_phys((unsigned long)macb->tx_buffer); +#endif - macb->rx_buffer_dma = (unsigned long)macb->rx_buffer; - macb->rx_ring_dma = (unsigned long)macb->rx_ring; - macb->tx_ring_dma = (unsigned long)macb->tx_ring; + macb->rx_ring = rt_malloc(MACB_RX_RING_SIZE * sizeof(struct macb_dma_desc)); + if (macb->rx_ring == RT_NULL) + goto err3; + EMAC_CACHE_INVALIDATE(macb->rx_ring, MACB_RX_RING_SIZE * sizeof(struct macb_dma_desc)); + macb->rx_ring_dma = emac_virt_to_phys((unsigned long)macb->rx_ring); + macb->rx_ring = (struct macb_dma_desc *)MMU_NOCACHE_ADDR((unsigned long)macb->rx_ring); + macb->rx_buffer = rt_malloc(MACB_RX_BUFFER_SIZE); + if (macb->rx_buffer == RT_NULL) + goto err4; + macb->rx_buffer_dma = emac_virt_to_phys((unsigned long)macb->rx_buffer); - macb->rx_ring = MMU_NOCACHE_ADDR(macb->rx_ring); - macb->tx_ring = MMU_NOCACHE_ADDR(macb->tx_ring); + macb->tx_pending = DEF_TX_RING_PENDING; macb->regs = AT91SAM9260_BASE_EMAC; macb->phy_addr = 0x00; @@ -653,16 +836,41 @@ void macb_initialize() ncfgr = MACB_BF(CLK, MACB_CLK_DIV64); macb_writel(macb, NCFGR, ncfgr); + + macb->link = 0; + + return RT_EOK; + +err4: + rt_free(macb->rx_ring); + macb->rx_ring = RT_NULL; +err3: +#if !defined(MACB_TX_SRAM) + rt_free(macb->tx_buffer); + macb->tx_buffer = RT_NULL; +err2: + rt_free(macb->tx_ring); + macb->tx_ring = RT_NULL; +err1: +#endif + return -RT_ENOMEM; } void rt_hw_macb_init() { + rt_err_t ret; at91_sys_write(AT91_PMC + AT91_PMC_PCER, 1 << AT91SAM9260_ID_EMAC); //enable macb clock macb_gpio_init(); rt_memset(&macb_device, 0, sizeof(macb_device)); - macb_initialize(); - rt_sem_init(&sem_ack, "tx_ack", 1, RT_IPC_FLAG_FIFO); - rt_sem_init(&sem_lock, "eth_lock", 1, RT_IPC_FLAG_FIFO); + ret = macb_initialize(); + if (ret != RT_EOK) + { + rt_kprintf("AT91 EMAC initialized failed\n"); + return; + } + rt_sem_init(&macb_device.tx_ack, "tx_ack", 0, RT_IPC_FLAG_FIFO); + rt_sem_init(&macb_device.tx_lock, "tx_lock", 1, RT_IPC_FLAG_FIFO); + rt_sem_init(&macb_device.rx_lock, "rx_lock", 1, RT_IPC_FLAG_FIFO); macb_device.dev_addr[0] = 0x00; macb_device.dev_addr[1] = 0x60; diff --git a/bsp/lm3s8962/drivers/luminaryif.c b/bsp/lm3s8962/drivers/luminaryif.c index cc92ac2aad..0c2e4f9293 100644 --- a/bsp/lm3s8962/drivers/luminaryif.c +++ b/bsp/lm3s8962/drivers/luminaryif.c @@ -424,6 +424,10 @@ struct pbuf * luminaryif_rx(rt_device_t dev) lwip_stats.link.memerr++; lwip_stats.link.drop++; #endif + // + // Enable Ethernet RX Interrupt. + // + EthernetIntEnable(ETH_BASE, ETH_INT_RX); } return(p); diff --git a/bsp/lm3s9b9x/drivers/luminaryif.c b/bsp/lm3s9b9x/drivers/luminaryif.c index 4511924aa9..4f260dd927 100644 --- a/bsp/lm3s9b9x/drivers/luminaryif.c +++ b/bsp/lm3s9b9x/drivers/luminaryif.c @@ -423,6 +423,10 @@ struct pbuf * luminaryif_rx(rt_device_t dev) lwip_stats.link.memerr++; lwip_stats.link.drop++; #endif + // + // Enable Ethernet RX Interrupt. + // + EthernetIntEnable(ETH_BASE, ETH_INT_RX); } return(p); diff --git a/bsp/lpc178x/project.uvproj b/bsp/lpc178x/project.uvproj index 62e400cd9c..8c259ccd04 100644 --- a/bsp/lpc178x/project.uvproj +++ b/bsp/lpc178x/project.uvproj @@ -350,7 +350,7 @@ - .;..\..\components\finsh;..\..\components\rtgui\common;..\..\components\rtgui\include;..\..\components\rtgui\server;..\..\components\rtgui\widgets;..\..\include;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;CMSIS\CM3\CoreSupport;CMSIS\CM3\DeviceSupport\NXP\LPC177x_8x;applications;drivers + .;..\..\components\finsh;..\..\include;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;CMSIS\CM3\CoreSupport;CMSIS\CM3\DeviceSupport\NXP\LPC177x_8x;applications;drivers @@ -631,6 +631,16 @@ 1 ..\..\components\finsh\finsh_vm.c + + msh.c + 1 + ..\..\components\finsh\msh.c + + + msh_cmd.c + 1 + ..\..\components\finsh\msh_cmd.c + shell.c 1 @@ -643,486 +653,6 @@ - - RTGUI - - - blit.c - 1 - ..\..\components\rtgui\common\blit.c - - - color.c - 1 - ..\..\components\rtgui\common\color.c - - - region.c - 1 - ..\..\components\rtgui\common\region.c - - - rtgui_object.c - 1 - ..\..\components\rtgui\common\rtgui_object.c - - - rtgui_system.c - 1 - ..\..\components\rtgui\common\rtgui_system.c - - - rtgui_theme.c - 1 - ..\..\components\rtgui\common\rtgui_theme.c - - - rtgui_xml.c - 1 - ..\..\components\rtgui\common\rtgui_xml.c - - - rtgui_app.c - 1 - ..\..\components\rtgui\common\rtgui_app.c - - - dc.c - 1 - ..\..\components\rtgui\common\dc.c - - - dc_hw.c - 1 - ..\..\components\rtgui\common\dc_hw.c - - - dc_buffer.c - 1 - ..\..\components\rtgui\common\dc_buffer.c - - - dc_client.c - 1 - ..\..\components\rtgui\common\dc_client.c - - - filerw.c - 1 - ..\..\components\rtgui\common\filerw.c - - - image.c - 1 - ..\..\components\rtgui\common\image.c - - - image_xpm.c - 1 - ..\..\components\rtgui\common\image_xpm.c - - - image_hdc.c - 1 - ..\..\components\rtgui\common\image_hdc.c - - - image_bmp.c - 1 - ..\..\components\rtgui\common\image_bmp.c - - - image_png.c - 1 - ..\..\components\rtgui\common\image_png.c - - - image_jpg.c - 1 - ..\..\components\rtgui\common\image_jpg.c - - - image_container.c - 1 - ..\..\components\rtgui\common\image_container.c - - - font.c - 1 - ..\..\components\rtgui\common\font.c - - - font_bmp.c - 1 - ..\..\components\rtgui\common\font_bmp.c - - - font_hz_file.c - 1 - ..\..\components\rtgui\common\font_hz_file.c - - - font_hz_bmp.c - 1 - ..\..\components\rtgui\common\font_hz_bmp.c - - - asc12font.c - 1 - ..\..\components\rtgui\common\asc12font.c - - - asc16font.c - 1 - ..\..\components\rtgui\common\asc16font.c - - - hz12font.c - 1 - ..\..\components\rtgui\common\hz12font.c - - - hz16font.c - 1 - ..\..\components\rtgui\common\hz16font.c - - - framebuffer_driver.c - 1 - ..\..\components\rtgui\common\framebuffer_driver.c - - - pixel_driver.c - 1 - ..\..\components\rtgui\common\pixel_driver.c - - - rtgui_mv_model.c - 1 - ..\..\components\rtgui\common\rtgui_mv_model.c - - - driver.c - 1 - ..\..\components\rtgui\server\driver.c - - - mouse.c - 1 - ..\..\components\rtgui\server\mouse.c - - - server.c - 1 - ..\..\components\rtgui\server\server.c - - - topwin.c - 1 - ..\..\components\rtgui\server\topwin.c - - - box.c - 1 - ..\..\components\rtgui\widgets\box.c - - - button.c - 1 - ..\..\components\rtgui\widgets\button.c - - - checkbox.c - 1 - ..\..\components\rtgui\widgets\checkbox.c - - - combobox.c - 1 - ..\..\components\rtgui\widgets\combobox.c - - - iconbox.c - 1 - ..\..\components\rtgui\widgets\iconbox.c - - - label.c - 1 - ..\..\components\rtgui\widgets\label.c - - - textview.c - 1 - ..\..\components\rtgui\widgets\textview.c - - - listctrl.c - 1 - ..\..\components\rtgui\widgets\listctrl.c - - - menu.c - 1 - ..\..\components\rtgui\widgets\menu.c - - - progressbar.c - 1 - ..\..\components\rtgui\widgets\progressbar.c - - - radiobox.c - 1 - ..\..\components\rtgui\widgets\radiobox.c - - - slider.c - 1 - ..\..\components\rtgui\widgets\slider.c - - - scrollbar.c - 1 - ..\..\components\rtgui\widgets\scrollbar.c - - - staticline.c - 1 - ..\..\components\rtgui\widgets\staticline.c - - - textbox.c - 1 - ..\..\components\rtgui\widgets\textbox.c - - - listbox.c - 1 - ..\..\components\rtgui\widgets\listbox.c - - - title.c - 1 - ..\..\components\rtgui\widgets\title.c - - - notebook.c - 1 - ..\..\components\rtgui\widgets\notebook.c - - - container.c - 1 - ..\..\components\rtgui\widgets\container.c - - - list_view.c - 1 - ..\..\components\rtgui\widgets\list_view.c - - - filelist_view.c - 1 - ..\..\components\rtgui\widgets\filelist_view.c - - - widget.c - 1 - ..\..\components\rtgui\widgets\widget.c - - - window.c - 1 - ..\..\components\rtgui\widgets\window.c - - - panel.c - 1 - ..\..\components\rtgui\widgets\panel.c - - - groupbox.c - 1 - ..\..\components\rtgui\widgets\groupbox.c - - - edit.c - 1 - ..\..\components\rtgui\widgets\edit.c - - - mv_view.c - 1 - ..\..\components\rtgui\widgets\mv_view.c - - - plot.c - 1 - ..\..\components\rtgui\widgets\plot.c - - - plot_curve.c - 1 - ..\..\components\rtgui\widgets\plot_curve.c - - - - - gui_examples - - - demo_application.c - 1 - ..\..\examples\gui\demo_application.c - - - demo_view.c - 1 - ..\..\examples\gui\demo_view.c - - - demo_xml.c - 1 - ..\..\examples\gui\demo_xml.c - - - demo_view_benchmark.c - 1 - ..\..\examples\gui\demo_view_benchmark.c - - - demo_view_dc.c - 1 - ..\..\examples\gui\demo_view_dc.c - - - demo_view_ttf.c - 1 - ..\..\examples\gui\demo_view_ttf.c - - - demo_view_dc_buffer.c - 1 - ..\..\examples\gui\demo_view_dc_buffer.c - - - demo_view_animation.c - 1 - ..\..\examples\gui\demo_view_animation.c - - - demo_view_buffer_animation.c - 1 - ..\..\examples\gui\demo_view_buffer_animation.c - - - demo_view_instrument_panel.c - 1 - ..\..\examples\gui\demo_view_instrument_panel.c - - - demo_view_window.c - 1 - ..\..\examples\gui\demo_view_window.c - - - demo_view_label.c - 1 - ..\..\examples\gui\demo_view_label.c - - - demo_view_button.c - 1 - ..\..\examples\gui\demo_view_button.c - - - demo_view_checkbox.c - 1 - ..\..\examples\gui\demo_view_checkbox.c - - - demo_view_progressbar.c - 1 - ..\..\examples\gui\demo_view_progressbar.c - - - demo_view_scrollbar.c - 1 - ..\..\examples\gui\demo_view_scrollbar.c - - - demo_view_radiobox.c - 1 - ..\..\examples\gui\demo_view_radiobox.c - - - demo_view_textbox.c - 1 - ..\..\examples\gui\demo_view_textbox.c - - - demo_view_listbox.c - 1 - ..\..\examples\gui\demo_view_listbox.c - - - demo_view_menu.c - 1 - ..\..\examples\gui\demo_view_menu.c - - - demo_view_listctrl.c - 1 - ..\..\examples\gui\demo_view_listctrl.c - - - demo_view_combobox.c - 1 - ..\..\examples\gui\demo_view_combobox.c - - - demo_view_slider.c - 1 - ..\..\examples\gui\demo_view_slider.c - - - demo_view_notebook.c - 1 - ..\..\examples\gui\demo_view_notebook.c - - - demo_view_mywidget.c - 1 - ..\..\examples\gui\demo_view_mywidget.c - - - demo_view_box.c - 1 - ..\..\examples\gui\demo_view_box.c - - - demo_view_edit.c - 1 - ..\..\examples\gui\demo_view_edit.c - - - demo_view_bmp.c - 1 - ..\..\examples\gui\demo_view_bmp.c - - - demo_plot.c - 1 - ..\..\examples\gui\demo_plot.c - - - mywidget.c - 1 - ..\..\examples\gui\mywidget.c - - - diff --git a/documentation/doxygen/mainpage.h b/documentation/doxygen/mainpage.h index a9d932da64..31ec2d26a0 100644 --- a/documentation/doxygen/mainpage.h +++ b/documentation/doxygen/mainpage.h @@ -5,7 +5,7 @@ /** * @mainpage Introduction * @author RT-Thread Development Team - * @version 1.1.0 + * @version 1.2.0 * * RT-Thread RTOS is an open source embedded real-time operating system and is * designed specifically for small memory footprint platforms. The real-time and diff --git a/examples/kernel/semaphore_static.c b/examples/kernel/semaphore_static.c index 5528b806fb..b64d5cef47 100644 --- a/examples/kernel/semaphore_static.c +++ b/examples/kernel/semaphore_static.c @@ -114,7 +114,7 @@ int _tc_semaphore_static(void) { /* 设置TestCase清理回调函数 */ tc_cleanup(_tc_cleanup); - semaphore_static_init(void); + semaphore_static_init(); /* 返回TestCase运行的最长时间 */ return 100; @@ -125,7 +125,7 @@ FINSH_FUNCTION_EXPORT(_tc_semaphore_static, a static semaphore example); /* 用户应用入口 */ int rt_application_init(void) { - semaphore_static_init(void); + semaphore_static_init(); return 0; } diff --git a/libcpu/arm/at91sam926x/mmu.c b/libcpu/arm/at91sam926x/mmu.c index d2db9d5d73..5b88eee27c 100644 --- a/libcpu/arm/at91sam926x/mmu.c +++ b/libcpu/arm/at91sam926x/mmu.c @@ -471,7 +471,7 @@ void rt_hw_mmu_init(void) mmu_setmtt(0x00000000, 0xFFFFFFFF, 0x00000000, RW_NCNB); /* None cached for 4G memory */ mmu_setmtt(0x20000000, 0x24000000-1, 0x20000000, RW_CB); /* 64M cached SDRAM memory */ mmu_setmtt(0x00000000, 0x100000, 0x20000000, RW_CB); /* isr vector table */ - mmu_setmtt(0x90000000, 0x100000, 0x00000000, RW_CB); /* 4K cached internal memory */ + mmu_setmtt(0x90000000, 0x90400000 - 1, 0x00200000, RW_NCNB); /* 4K SRAM0 + 4k SRAM1 */ mmu_setmtt(0xA0000000, 0xA4000000-1, 0x20000000, RW_NCNB); /* 64M none-cached SDRAM memory */ /* set MMU table address */ diff --git a/libcpu/arm/sep4020/interrupt.c b/libcpu/arm/sep4020/interrupt.c index 88130c1a33..8b0b8bbd64 100644 --- a/libcpu/arm/sep4020/interrupt.c +++ b/libcpu/arm/sep4020/interrupt.c @@ -31,10 +31,9 @@ rt_uint32_t rt_thread_switch_interrupt_flag; */ /*@{*/ -rt_isr_handler_t rt_hw_interrupt_handle(rt_uint32_t vector) +static void rt_hw_interrupt_handle(int vector, void *param) { rt_kprintf("Unhandled interrupt %d occured!!!\n", vector); - return RT_NULL; } /** @@ -85,7 +84,7 @@ void rt_hw_interrupt_init(void) * This function will mask a interrupt. * @param vector the interrupt number */ -void rt_hw_interrupt_mask(rt_uint32_t vector) +void rt_hw_interrupt_mask(int vector) { *(RP)(INTC_IMR) |= 1 << vector; } @@ -94,7 +93,7 @@ void rt_hw_interrupt_mask(rt_uint32_t vector) * This function will un-mask a interrupt. * @param vector the interrupt number */ -void rt_hw_interrupt_umask(rt_uint32_t vector) +void rt_hw_interrupt_umask(int vector) { if(vector == 16) { diff --git a/libcpu/arm/sep4020/trap.c b/libcpu/arm/sep4020/trap.c index 33da0d9e98..9c18ced698 100644 --- a/libcpu/arm/sep4020/trap.c +++ b/libcpu/arm/sep4020/trap.c @@ -152,7 +152,7 @@ void rt_hw_trap_irq(void) } /* get interrupt service routine */ - isr_func = isr_table[irq].isr_handle; + isr_func = isr_table[irq].handler; param = isr_table[irq].param; /* turn to interrupt service routine */ diff --git a/src/kservice.c b/src/kservice.c index 67262ff084..1ffe7d0008 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -501,7 +501,7 @@ void rt_show_version(void) rt_kprintf("- RT - Thread Operating System\n"); rt_kprintf(" / | \\ %d.%d.%d build %s\n", RT_VERSION, RT_SUBVERSION, RT_REVISION, __DATE__); - rt_kprintf(" 2006 - 2012 Copyright by rt-thread team\n"); + rt_kprintf(" 2006 - 2013 Copyright by rt-thread team\n"); } RTM_EXPORT(rt_show_version);