diff options
| author | Bernard Xiong <[email protected]> | 2013-03-31 04:14:40 -0700 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2013-03-31 04:14:40 -0700 |
| commit | c1b600644fdf418532faf7ad98fef0b521dcdca7 (patch) | |
| tree | 7bb9acaa998eb9c30a48ea331f6cc17f926d8c9b /bsp | |
| parent | a667da553e0f08f5f4afdd9022e6b1105d76bd81 (diff) | |
| parent | 2ccb3c7589f08d0c46ccd9b7ec7a35b1b678d609 (diff) | |
Merge pull request #56 from aozima/aozima
Modify the interrupt interface implementations.
Diffstat (limited to 'bsp')
| -rw-r--r-- | bsp/dev3210/rtconfig.h | 1 | ||||
| -rw-r--r-- | bsp/dev3210/uart.c | 6 | ||||
| -rw-r--r-- | bsp/jz47xx/board.c | 2 | ||||
| -rw-r--r-- | bsp/jz47xx/uart.c | 2 | ||||
| -rw-r--r-- | bsp/lpc2148/drivers/board.c | 14 | ||||
| -rw-r--r-- | bsp/lpc2148/drivers/serial.c | 50 | ||||
| -rw-r--r-- | bsp/lpc2478/drivers/board.c | 2 | ||||
| -rw-r--r-- | bsp/lpc2478/drivers/serial.c | 33 | ||||
| -rw-r--r-- | bsp/ls1bdev/drivers/uart.c | 4 | ||||
| -rw-r--r-- | bsp/ls1bdev/rtconfig.h | 2 | ||||
| -rw-r--r-- | bsp/mini2440/board.c | 22 | ||||
| -rw-r--r-- | bsp/mini2440/dm9000.c | 4 | ||||
| -rw-r--r-- | bsp/mini2440/rtconfig.h | 2 | ||||
| -rw-r--r-- | bsp/mini4020/drivers/board.c | 11 | ||||
| -rw-r--r-- | bsp/mini4020/drivers/dm9161.c | 6 | ||||
| -rw-r--r-- | bsp/mini4020/rtconfig.h | 1 | ||||
| -rw-r--r-- | bsp/mini4020/template.Uv2 | 4 | ||||
| -rw-r--r-- | bsp/sam7x/drivers/board.c | 2 |
18 files changed, 77 insertions, 91 deletions
diff --git a/bsp/dev3210/rtconfig.h b/bsp/dev3210/rtconfig.h index 7968b263f3..cd94adf742 100644 --- a/bsp/dev3210/rtconfig.h +++ b/bsp/dev3210/rtconfig.h @@ -18,6 +18,7 @@ /* Thread Debug */ #define RT_DEBUG #define RT_USING_OVERFLOW_CHECK +#define RT_USING_INTERRUPT_INFO /* Using Hook */ #define RT_USING_HOOK diff --git a/bsp/dev3210/uart.c b/bsp/dev3210/uart.c index 1b8db9ec39..9d638a515a 100644 --- a/bsp/dev3210/uart.c +++ b/bsp/dev3210/uart.c @@ -25,7 +25,7 @@ /* UART interrupt enable register value */ #define UARTIER_IME (1 << 3) -#define UARTIER_ILE (1 << 2) +#define UARTIER_ILE (1 << 2) #define UARTIER_ITXE (1 << 1) #define UARTIER_IRXE (1 << 0) @@ -59,7 +59,7 @@ struct rt_uart_soc3210 rt_uint8_t rx_buffer[RT_UART_RX_BUFFER_SIZE]; }uart_device; -static void rt_uart_irqhandler(int irqno) +static void rt_uart_irqhandler(int irqno, void *param) { rt_ubase_t level; rt_uint8_t isr; @@ -142,7 +142,7 @@ static rt_err_t rt_uart_open(rt_device_t dev, rt_uint16_t oflag) UART_IER(uart->hw_base) |= UARTIER_IRXE; /* install interrupt */ - rt_hw_interrupt_install(uart->irq, rt_uart_irqhandler, RT_NULL); + rt_hw_interrupt_install(uart->irq, rt_uart_irqhandler, RT_NULL, "UART"); rt_hw_interrupt_umask(uart->irq); } return RT_EOK; diff --git a/bsp/jz47xx/board.c b/bsp/jz47xx/board.c index b2f1ba0092..c742d32e7d 100644 --- a/bsp/jz47xx/board.c +++ b/bsp/jz47xx/board.c @@ -39,7 +39,7 @@ void rt_hw_timer_handler(int vector, void* param) /** * This function will initial OS timer */ -void rt_hw_timer_init() +void rt_hw_timer_init(void) { rt_uint32_t val; diff --git a/bsp/jz47xx/uart.c b/bsp/jz47xx/uart.c index 309a89d63f..18edad9d67 100644 --- a/bsp/jz47xx/uart.c +++ b/bsp/jz47xx/uart.c @@ -10,7 +10,7 @@ /*@{*/ #if defined(RT_USING_UART) && defined(RT_USING_DEVICE) -#define UART_BAUDRATE 115200 +#define UART_BAUDRATE 57600 #define DEV_CLK 12000000 /* diff --git a/bsp/lpc2148/drivers/board.c b/bsp/lpc2148/drivers/board.c index ff339d5fa3..10f25e079a 100644 --- a/bsp/lpc2148/drivers/board.c +++ b/bsp/lpc2148/drivers/board.c @@ -27,7 +27,7 @@ * This is the timer interrupt service routine. * @param vector the irq number for timer */ -void rt_hw_timer_handler(int vector) +void rt_hw_timer_handler(int vector, void *param) { rt_tick_increase(); @@ -53,10 +53,10 @@ void rt_hw_console_output(const char* str) while (!(U0LSR & 0x20)); U0THR = '\r'; } - + while (!(U0LSR & 0x20)); U0THR = *str; - + str ++; } } @@ -82,11 +82,11 @@ void rt_hw_console_init() /** * This function will initial sam7x256 board. */ -void rt_hw_board_init() +void rt_hw_board_init(void) { /* console init */ rt_hw_console_init(); - + /* prescaler = 0*/ T0PR = 0; T0PC = 0; @@ -94,12 +94,12 @@ void rt_hw_board_init() /* reset and enable MR0 interrupt */ T0MCR = 0x3; T0MR0 = PCLK / RT_TICK_PER_SECOND; - + /* enable timer 0 */ T0TCR = 1; /* install timer handler */ - rt_hw_interrupt_install(TIMER0_INT, rt_hw_timer_handler, RT_NULL); + rt_hw_interrupt_install(TIMER0_INT, rt_hw_timer_handler, RT_NULL, "TIMER0"); rt_hw_interrupt_umask(TIMER0_INT); } diff --git a/bsp/lpc2148/drivers/serial.c b/bsp/lpc2148/drivers/serial.c index 2a16be3f82..6cfcbb18a8 100644 --- a/bsp/lpc2148/drivers/serial.c +++ b/bsp/lpc2148/drivers/serial.c @@ -69,7 +69,7 @@ void rt_hw_uart_isr(struct rt_lpcserial* lpc_serial) UNUSED rt_uint32_t iir; RT_ASSERT(lpc_serial != RT_NULL) - + if (UART_LSR(lpc_serial->hw_base) & 0x01) { rt_base_t level; @@ -80,12 +80,12 @@ void rt_hw_uart_isr(struct rt_lpcserial* lpc_serial) level = rt_hw_interrupt_disable(); /* read character */ - lpc_serial->rx_buffer[lpc_serial->save_index] = + lpc_serial->rx_buffer[lpc_serial->save_index] = UART_RBR(lpc_serial->hw_base); lpc_serial->save_index ++; if (lpc_serial->save_index >= RT_UART_RX_BUFFER_SIZE) lpc_serial->save_index = 0; - + /* if the next position is read index, discard this 'read char' */ if (lpc_serial->save_index == lpc_serial->read_index) { @@ -113,7 +113,7 @@ void rt_hw_uart_isr(struct rt_lpcserial* lpc_serial) } #ifdef RT_USING_UART1 -void rt_hw_uart_isr_1(int irqno) +void rt_hw_uart_isr_1(int irqno, void *param) { /* get lpc serial device */ rt_hw_uart_isr(&serial1); @@ -121,7 +121,7 @@ void rt_hw_uart_isr_1(int irqno) #endif #ifdef RT_USING_UART2 -void rt_hw_uart_isr_2(int irqno) +void rt_hw_uart_isr_2(int irqno, void *param) { /* get lpc serial device */ rt_hw_uart_isr(&serial2); @@ -153,13 +153,15 @@ static rt_err_t rt_serial_open(rt_device_t dev, rt_uint16_t oflag) if (lpc_serial->irqno == UART0_INT) { #ifdef RT_USING_UART1 - rt_hw_interrupt_install(lpc_serial->irqno, rt_hw_uart_isr_1, RT_NULL); + rt_hw_interrupt_install(lpc_serial->irqno, + rt_hw_uart_isr_1, &serial1, "UART1"); #endif } else { #ifdef RT_USING_UART2 - rt_hw_interrupt_install(lpc_serial->irqno, rt_hw_uart_isr_2, RT_NULL); + rt_hw_interrupt_install(lpc_serial->irqno, + rt_hw_uart_isr_2, &serial2, "UART2"); #endif } @@ -173,7 +175,7 @@ static rt_err_t rt_serial_close(rt_device_t dev) { struct rt_lpcserial* lpc_serial; lpc_serial = (struct rt_lpcserial*) dev; - + RT_ASSERT(lpc_serial != RT_NULL); if (dev->flag & RT_DEVICE_FLAG_INT_RX) @@ -244,7 +246,7 @@ static rt_size_t rt_serial_read(rt_device_t dev, rt_off_t pos, void* buffer, rt_ { /* Read Character */ *ptr = UART_RBR(lpc_serial->hw_base); - + ptr ++; size --; } @@ -271,7 +273,7 @@ static rt_size_t rt_serial_write(rt_device_t dev, rt_off_t pos, const void* buff /* polling write */ ptr = (char *)buffer; - + if (dev->flag & RT_DEVICE_FLAG_STREAM) { /* stream mode */ @@ -285,7 +287,7 @@ static rt_size_t rt_serial_write(rt_device_t dev, rt_off_t pos, const void* buff while (!(UART_LSR(lpc_serial->hw_base) & 0x20)); UART_THR(lpc_serial->hw_base) = *ptr; - + ptr ++; size --; } @@ -296,37 +298,37 @@ static rt_size_t rt_serial_write(rt_device_t dev, rt_off_t pos, const void* buff { while (!(UART_LSR(lpc_serial->hw_base) & 0x20)); UART_THR(lpc_serial->hw_base) = *ptr; - + ptr ++; size --; } } - + return (rt_size_t) ptr - (rt_size_t) buffer; } void rt_hw_serial_init(void) { struct rt_lpcserial* lpc_serial; - + #ifdef RT_USING_UART1 lpc_serial = &serial1; - + lpc_serial->parent.type = RT_Device_Class_Char; - + lpc_serial->hw_base = 0xE000C000; lpc_serial->baudrate = 115200; lpc_serial->irqno = UART0_INT; - + rt_memset(lpc_serial->rx_buffer, 0, sizeof(lpc_serial->rx_buffer)); lpc_serial->read_index = lpc_serial->save_index = 0; /* Enable UART0 RxD and TxD pins */ - PINSEL0 |= 0x05; + PINSEL0 |= 0x05; /* 8 bits, no Parity, 1 Stop bit */ UART_LCR(lpc_serial->hw_base) = 0x83; - + /* Setup Baudrate */ UART_DLL(lpc_serial->hw_base) = (PCLK/16/lpc_serial->baudrate) & 0xFF; UART_DLM(lpc_serial->hw_base) = ((PCLK/16/lpc_serial->baudrate) >> 8) & 0xFF; @@ -334,6 +336,7 @@ void rt_hw_serial_init(void) /* DLAB = 0 */ UART_LCR(lpc_serial->hw_base) = 0x03; + lpc_serial->parent.type = RT_Device_Class_Char; lpc_serial->parent.init = rt_serial_init; lpc_serial->parent.open = rt_serial_open; lpc_serial->parent.close = rt_serial_close; @@ -342,13 +345,13 @@ void rt_hw_serial_init(void) lpc_serial->parent.control = rt_serial_control; lpc_serial->parent.user_data = RT_NULL; - rt_device_register(&lpc_serial->parent, + rt_device_register(&lpc_serial->parent, "uart1", RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX); #endif #ifdef RT_USING_UART2 lpc_serial = &serial2; - + lpc_serial->parent.type = RT_Device_Class_Char; lpc_serial->hw_base = 0xE0010000; @@ -363,7 +366,7 @@ void rt_hw_serial_init(void) /* 8 bits, no Parity, 1 Stop bit */ UART_LCR(lpc_serial->hw_base) = 0x83; - + /* Setup Baudrate */ UART_DLL(lpc_serial->hw_base) = (PCLK/16/lpc_serial->baudrate) & 0xFF; UART_DLM(lpc_serial->hw_base) = ((PCLK/16/lpc_serial->baudrate) >> 8) & 0xFF; @@ -371,6 +374,7 @@ void rt_hw_serial_init(void) /* DLAB = 0 */ UART_LCR(lpc_serial->hw_base) = 0x03; + lpc_serial->parent.type = RT_Device_Class_Char; lpc_serial->parent.init = rt_serial_init; lpc_serial->parent.open = rt_serial_open; lpc_serial->parent.close = rt_serial_close; @@ -379,7 +383,7 @@ void rt_hw_serial_init(void) lpc_serial->parent.control = rt_serial_control; lpc_serial->parent.user_data = RT_NULL; - rt_device_register(&lpc_serial->parent, + rt_device_register(&lpc_serial->parent, "uart2", RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX); #endif } diff --git a/bsp/lpc2478/drivers/board.c b/bsp/lpc2478/drivers/board.c index 1ddc0aaf79..ac17305062 100644 --- a/bsp/lpc2478/drivers/board.c +++ b/bsp/lpc2478/drivers/board.c @@ -37,7 +37,7 @@ void rt_timer_handler(int vector, void* param) /** * This function will init LPC2478 board */ -void rt_hw_board_init() +void rt_hw_board_init(void) { #if defined(RT_USING_DEVICE) && defined(RT_USING_UART1) rt_hw_serial_init(); diff --git a/bsp/lpc2478/drivers/serial.c b/bsp/lpc2478/drivers/serial.c index a5edc3c988..8a0e1aa15b 100644 --- a/bsp/lpc2478/drivers/serial.c +++ b/bsp/lpc2478/drivers/serial.c @@ -64,9 +64,10 @@ void rt_hw_serial_init(void); #define U0PINS 0x00000005 -void rt_hw_uart_isr(struct rt_lpcserial* lpc_serial) +void rt_hw_uart_isr(int irqno, void *param) { UNUSED rt_uint32_t iir; + struct rt_lpcserial* lpc_serial = (struct rt_lpcserial*)param; RT_ASSERT(lpc_serial != RT_NULL) @@ -112,21 +113,6 @@ void rt_hw_uart_isr(struct rt_lpcserial* lpc_serial) VICVectAddr = 0; } -#ifdef RT_USING_UART1 -void rt_hw_uart_isr_1(int irqno, void* param) -{ - /* get lpc serial device */ - rt_hw_uart_isr(&serial1); -} -#endif - -#ifdef RT_USING_UART2 -void rt_hw_uart_isr_2(int irqno, void* param) -{ - /* get lpc serial device */ - rt_hw_uart_isr(&serial2); -} -#endif /** * @addtogroup LPC214x @@ -150,19 +136,8 @@ static rt_err_t rt_serial_open(rt_device_t dev, rt_uint16_t oflag) UART_IER(lpc_serial->hw_base) = 0x01; /* install ISR */ - if (lpc_serial->irqno == UART0_INT) - { -#ifdef RT_USING_UART1 - rt_hw_interrupt_install(lpc_serial->irqno, rt_hw_uart_isr_1, RT_NULL, "uart1"); -#endif - } - else - { -#ifdef RT_USING_UART2 - rt_hw_interrupt_install(lpc_serial->irqno, rt_hw_uart_isr_2, RT_NULL, "uart2"); -#endif - } - + rt_hw_interrupt_install(lpc_serial->irqno, + rt_hw_uart_isr, lpc_serial, RT_NULL); rt_hw_interrupt_umask(lpc_serial->irqno); } diff --git a/bsp/ls1bdev/drivers/uart.c b/bsp/ls1bdev/drivers/uart.c index 80df23f1d6..4e897391fb 100644 --- a/bsp/ls1bdev/drivers/uart.c +++ b/bsp/ls1bdev/drivers/uart.c @@ -37,7 +37,7 @@ struct rt_uart_ls1b rt_uint8_t rx_buffer[RT_UART_RX_BUFFER_SIZE]; }uart_device; -static void rt_uart_irqhandler(int irqno) +static void rt_uart_irqhandler(int irqno, void *param) { rt_ubase_t level; rt_uint8_t isr; @@ -121,7 +121,7 @@ static rt_err_t rt_uart_open(rt_device_t dev, rt_uint16_t oflag) UART_IER(uart->hw_base) |= UARTIER_IRXE; /* install interrupt */ - rt_hw_interrupt_install(uart->irq, rt_uart_irqhandler, RT_NULL); + rt_hw_interrupt_install(uart->irq, rt_uart_irqhandler, RT_NULL, "UART"); rt_hw_interrupt_umask(uart->irq); } return RT_EOK; diff --git a/bsp/ls1bdev/rtconfig.h b/bsp/ls1bdev/rtconfig.h index b0f8a55575..b09f7b044c 100644 --- a/bsp/ls1bdev/rtconfig.h +++ b/bsp/ls1bdev/rtconfig.h @@ -21,6 +21,8 @@ // #define RT_THREAD_DEBUG // <bool name="RT_USING_OVERFLOW_CHECK" description="Thread stack over flow detect" default="true" /> #define RT_USING_OVERFLOW_CHECK +// <bool name="RT_USING_INTERRUPT_INFO" description="Show more interrupt description" default="true" /> +#define RT_USING_INTERRUPT_INFO // </section> // <bool name="RT_USING_HOOK" description="Using hook functions" default="true" /> diff --git a/bsp/mini2440/board.c b/bsp/mini2440/board.c index 23e78e6c7c..fc623386b4 100644 --- a/bsp/mini2440/board.c +++ b/bsp/mini2440/board.c @@ -58,7 +58,7 @@ struct rt_device uart2_device; /** * This function will handle rtos timer */ -static void rt_timer_handler(int vector) +static void rt_timer_handler(int vector, void *param) { rt_tick_increase(); } @@ -66,7 +66,7 @@ static void rt_timer_handler(int vector) /** * This function will handle serial */ -static void rt_serial0_handler(int vector) +static void rt_serial0_handler(int vector, void *param) { INTSUBMSK |= (BIT_SUB_RXD0); @@ -81,7 +81,7 @@ static void rt_serial0_handler(int vector) /** * This function will handle serial */ -static void rt_serial2_handler(int vector) +static void rt_serial2_handler(int vector, void *param) { INTSUBMSK |= (BIT_SUB_RXD2); @@ -133,7 +133,7 @@ static void rt_hw_uart_init(void) uart2.uart_device->ucon = 0x245; /* Set uart0 bps */ uart2.uart_device->ubrd = (rt_int32_t)(PCLK / (BPS * 16)) - 1; - + for (i = 0; i < 100; i++); /* install uart0 isr */ @@ -141,18 +141,18 @@ static void rt_hw_uart_init(void) /* install uart2 isr */ INTSUBMSK &= ~(BIT_SUB_RXD2); - - rt_hw_interrupt_install(INTUART0, rt_serial0_handler, RT_NULL); + + rt_hw_interrupt_install(INTUART0, rt_serial0_handler, RT_NULL, "UART0"); rt_hw_interrupt_umask(INTUART0); - rt_hw_interrupt_install(INTUART2, rt_serial2_handler, RT_NULL); - rt_hw_interrupt_umask(INTUART2); + rt_hw_interrupt_install(INTUART2, rt_serial2_handler, RT_NULL, "UART2"); + rt_hw_interrupt_umask(INTUART2); } /** * This function will init timer4 for system ticks */ -static void rt_hw_timer_init() +static void rt_hw_timer_init(void) { /* timer4, pre = 15+1 */ TCFG0 &= 0xffff00ff; @@ -165,7 +165,7 @@ static void rt_hw_timer_init() /* manual update */ TCON = TCON & (~(0x0f<<20)) | (0x02<<20); /* install interrupt handler */ - rt_hw_interrupt_install(INTTIMER4, rt_timer_handler, RT_NULL); + rt_hw_interrupt_install(INTTIMER4, rt_timer_handler, RT_NULL, "tick"); rt_hw_interrupt_umask(INTTIMER4); /* start timer4, reload */ @@ -175,7 +175,7 @@ static void rt_hw_timer_init() /** * This function will init s3ceb2410 board */ -void rt_hw_board_init() +void rt_hw_board_init(void) { /* initialize the system clock */ rt_hw_clock_init(); diff --git a/bsp/mini2440/dm9000.c b/bsp/mini2440/dm9000.c index ee8e404c82..527be3b7b8 100644 --- a/bsp/mini2440/dm9000.c +++ b/bsp/mini2440/dm9000.c @@ -572,7 +572,7 @@ __error_retry: #define B4_Tacp 0x0 #define B4_PMC 0x0 -void INTEINT4_7_handler(int irqno) +void INTEINT4_7_handler(int irqno, void *param) { rt_uint32_t eint_pend; @@ -637,7 +637,7 @@ void rt_hw_dm9000_init() eth_device_init(&(dm9000_device.parent), "e0"); /* instal interrupt */ - rt_hw_interrupt_install(INTEINT4_7, INTEINT4_7_handler, RT_NULL); + rt_hw_interrupt_install(INTEINT4_7, INTEINT4_7_handler, RT_NULL, "EINT4_7"); rt_hw_interrupt_umask(INTEINT4_7); } diff --git a/bsp/mini2440/rtconfig.h b/bsp/mini2440/rtconfig.h index 3f87e45073..2e4c05bbce 100644 --- a/bsp/mini2440/rtconfig.h +++ b/bsp/mini2440/rtconfig.h @@ -22,6 +22,8 @@ // #define RT_THREAD_DEBUG // <bool name="RT_USING_OVERFLOW_CHECK" description="Thread stack over flow detect" default="true" /> #define RT_USING_OVERFLOW_CHECK +// <bool name="RT_USING_INTERRUPT_INFO" description="Show more interrupt description" default="true" /> +#define RT_USING_INTERRUPT_INFO // </section> // <bool name="RT_USING_HOOK" description="Using hook functions" default="true" /> diff --git a/bsp/mini4020/drivers/board.c b/bsp/mini4020/drivers/board.c index b8341b8054..72b75d4846 100644 --- a/bsp/mini4020/drivers/board.c +++ b/bsp/mini4020/drivers/board.c @@ -34,7 +34,7 @@ struct serial_device uart0 = /** * This function will handle rtos timer */ -void rt_timer_handler(int vector) +void rt_timer_handler(int vector, void *param) { rt_uint32_t clear_int; rt_tick_increase(); @@ -47,7 +47,7 @@ void rt_timer_handler(int vector) /** * This function will handle serial */ -void rt_serial_handler(int vector) +void rt_serial_handler(int vector, void *param) { //rt_kprintf("in rt_serial_handler\n"); rt_int32_t stat = *(RP)UART0_IIR ; @@ -78,16 +78,17 @@ static void rt_hw_board_led_init(void) *(RP)GPIO_PORTE_DATA &= ~0x38; /* low */ } + /** * This function will init timer4 for system ticks */ - void rt_hw_timer_init(void) +void rt_hw_timer_init(void) { /*Set timer1*/ *(RP)TIMER_T1LCR = 880000; *(RP)TIMER_T1CR = 0x06; - rt_hw_interrupt_install(INTSRC_TIMER1, rt_timer_handler, RT_NULL); + rt_hw_interrupt_install(INTSRC_TIMER1, rt_timer_handler, RT_NULL, "tick"); rt_hw_interrupt_umask(INTSRC_TIMER1); /*Enable timer1*/ @@ -119,7 +120,7 @@ void rt_hw_uart_init(void) /*Disable tx interrupt*/ *(RP)(UART0_IER) &= ~(0x1<<1); - rt_hw_interrupt_install(INTSRC_UART0, rt_serial_handler, RT_NULL); + rt_hw_interrupt_install(INTSRC_UART0, rt_serial_handler, RT_NULL, "UART0"); rt_hw_interrupt_umask(INTSRC_UART0); /* register uart0 */ rt_hw_serial_register(&uart0_device, "uart0", diff --git a/bsp/mini4020/drivers/dm9161.c b/bsp/mini4020/drivers/dm9161.c index ea8294575d..2b02650dde 100644 --- a/bsp/mini4020/drivers/dm9161.c +++ b/bsp/mini4020/drivers/dm9161.c @@ -81,7 +81,7 @@ struct rt_dm9161_eth static struct rt_dm9161_eth dm9161_device; static struct rt_semaphore sem_ack, sem_lock; -void rt_dm9161_isr(int irqno); +void rt_dm9161_isr(int irqno, void *param); static void udelay(unsigned long ns) { @@ -201,7 +201,7 @@ static void read_phy(unsigned char phy_addr, unsigned char address, unsigned int } /* interrupt service routine */ -void rt_dm9161_isr(int irqno) +void rt_dm9161_isr(int irqno, void *param) { unsigned long intstatus; rt_uint32_t address; @@ -469,7 +469,7 @@ static rt_err_t rt_dm9161_open(rt_device_t dev, rt_uint16_t oflag) *(volatile unsigned long*)GPIO_PORTA_INTRCLR |= 0x0080; //����ж� *(volatile unsigned long*)GPIO_PORTA_INTRCLR = 0x0000; //����ж� - rt_hw_interrupt_install(INTSRC_MAC, rt_dm9161_isr, RT_NULL); + rt_hw_interrupt_install(INTSRC_MAC, rt_dm9161_isr, RT_NULL, "EMAC"); enable_irq(INTSRC_EXINT7); diff --git a/bsp/mini4020/rtconfig.h b/bsp/mini4020/rtconfig.h index 2f0060b6aa..9385fe0056 100644 --- a/bsp/mini4020/rtconfig.h +++ b/bsp/mini4020/rtconfig.h @@ -20,6 +20,7 @@ /* #define RT_THREAD_DEBUG */ #define RT_USING_OVERFLOW_CHECK +#define RT_USING_INTERRUPT_INFO /* Using Hook */ #define RT_USING_HOOK diff --git a/bsp/mini4020/template.Uv2 b/bsp/mini4020/template.Uv2 index 6ad293a7b3..c64e205761 100644 --- a/bsp/mini4020/template.Uv2 +++ b/bsp/mini4020/template.Uv2 @@ -31,14 +31,14 @@ Options 1,0,0 // Target 'RT-Thread_Mini4020' EnvReg ()
OrgReg ()
TgStat=16
- OutDir (.\)
+ OutDir (.\build\)
OutName (rtthread-mini4020)
GenApp=1
GenLib=0
GenHex=0
Debug=1
Browse=0
- LstDir (.\)
+ LstDir (.\build\)
HexSel=1
MG32K=0
TGMORE=0
diff --git a/bsp/sam7x/drivers/board.c b/bsp/sam7x/drivers/board.c index 16dfacb9be..1e13656f66 100644 --- a/bsp/sam7x/drivers/board.c +++ b/bsp/sam7x/drivers/board.c @@ -154,7 +154,7 @@ static void rt_hw_console_init() /** * This function will initial sam7x board. */ -void rt_hw_board_init() +void rt_hw_board_init(void) { extern void rt_serial_init(void); |
