--- software/include/base/uart.h | 3 +-- software/include/hw/interrupts.h | 6 ++---- software/include/hw/midi.h | 10 +++++++++- software/include/hw/uart.h | 15 ++++++++++----- 4 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/software/include/base/uart.h b/software/include/base/uart.h index 7b90ac1..f4229c2 100644 --- a/software/include/base/uart.h +++ b/software/include/base/uart.h @@ -19,8 +19,7 @@ #define __UART_H void uart_init(); -void uart_isr_rx(); -void uart_isr_tx(); +void uart_isr(); void uart_force_sync(int f); void uart_write(char c); diff --git a/software/include/hw/interrupts.h b/software/include/hw/interrupts.h index b077e55..8daeffe 100644 --- a/software/include/hw/interrupts.h +++ b/software/include/hw/interrupts.h @@ -18,8 +18,7 @@ #ifndef __HW_INTERRUPTS_H #define __HW_INTERRUPTS_H -#define IRQ_UARTRX (0x00000001) /* 0 */ -#define IRQ_UARTTX (0x00000002) /* 1 */ +#define IRQ_UART (0x00000001) /* 0 */ #define IRQ_GPIO (0x00000004) /* 2 */ #define IRQ_TIMER0 (0x00000008) /* 3 */ #define IRQ_TIMER1 (0x00000010) /* 4 */ @@ -32,8 +31,7 @@ #define IRQ_ETHRX (0x00000800) /* 11 */ #define IRQ_ETHTX (0x00001000) /* 12 */ #define IRQ_VIDEOIN (0x00002000) /* 13 */ -#define IRQ_MIDIRX (0x00004000) /* 14 */ -#define IRQ_MIDITX (0x00008000) /* 15 */ +#define IRQ_MIDI (0x00004000) /* 14 */ #define IRQ_IR (0x00010000) /* 16 */ #define IRQ_USB (0x00020000) /* 17 */ diff --git a/software/include/hw/midi.h b/software/include/hw/midi.h index 7ab6a8e..068a35a 100644 --- a/software/include/hw/midi.h +++ b/software/include/hw/midi.h @@ -22,6 +22,14 @@ #define CSR_MIDI_RXTX MMPTR(0xe000b000) #define CSR_MIDI_DIVISOR MMPTR(0xe000b004) -#define CSR_MIDI_THRU MMPTR(0xe000b008) +#define CSR_MIDI_STAT MMPTR(0xe000b008) +#define CSR_MIDI_CTRL MMPTR(0xe000b00c) + +#define MIDI_STAT_DR (0x1) +#define MIDI_STAT_THRE (0x2) + +#define MIDI_CTRL_RX_INT (0x1) +#define MIDI_CTRL_TX_INT (0x2) +#define MIDI_CTRL_THRU (0x4) #endif /* __HW_MIDI_H */ diff --git a/software/include/hw/uart.h b/software/include/hw/uart.h index ddfa024..b1bc718 100644 --- a/software/include/hw/uart.h +++ b/software/include/hw/uart.h @@ -22,12 +22,17 @@ #define CSR_UART_RXTX MMPTR(0xe0000000) #define CSR_UART_DIVISOR MMPTR(0xe0000004) -#define CSR_UART_THRU MMPTR(0xe0000008) -#define CSR_UART_BREAK MMPTR(0xe000000c) +#define CSR_UART_STAT MMPTR(0xe0000008) +#define CSR_UART_CTRL MMPTR(0xe000000c) +#define CSR_UART_DEBUG MMPTR(0xe0000010) -#define UART_THRU (0x1) +#define UART_STAT_DR (0x1) +#define UART_STAT_THRE (0x2) -#define UART_BREAK_EN (0x1) -#define UART_TX_PENDING (0x2) +#define UART_CTRL_RX_INT (0x1) +#define UART_CTRL_TX_INT (0x2) +#define UART_CTRL_THRU (0x4) + +#define UART_DEBUG_BREAK_EN (0x1) #endif /* __HW_UART_H */ -- 1.7.2.5 _______________________________________________ http://lists.milkymist.org/listinfo.cgi/devel-milkymist.org IRC: #milkymist@Freenode Twitter: www.twitter.com/milkymistvj Ideas? http://milkymist.uservoice.com
