support new uart core

Xiangfu Liu · Xiangfu Liu · commit 8239be065397 · 2011-11-22T09:42:03.000+08:00
diff --git a/src/main.c b/src/main.c
@@ -29,10 +29,8 @@ void isr()
 
 	irqs = irq_pending() & irq_getmask();
 
-	if(irqs & IRQ_UARTRX)
-		uart_isr_rx();
-	if(irqs & IRQ_UARTTX)
-		uart_isr_tx();
+	if(irqs & IRQ_UART)
+		uart_isr();
 
 	if(irqs & IRQ_USB)
 		usb_isr();
diff --git a/src/tests_midi.c b/src/tests_midi.c
@@ -29,22 +29,23 @@ static int loopback()
 	int result = TEST_STATUS_PASSED;
 
 	printf("press 'e' exit MIDI test\n");
-	irq_ack(IRQ_MIDITX|IRQ_MIDIRX);
+	irq_ack(IRQ_MIDI);
 	while(1) {
 		if (c == 256) {
 			printf("0 ~ 255 sent out, press 'e' for exit\n");
 			c = 0;
 		}
 		CSR_MIDI_RXTX = c;
-		while(!(irq_pending() & IRQ_MIDITX)) {
+		while(!(CSR_MIDI_STAT & MIDI_STAT_TX_EVT)) {
 			if(readchar_nonblock()) {
 				e = readchar();
 				if(e == 'e') return result;
 			}
 		}
-		irq_ack(IRQ_MIDITX);
+		CSR_MIDI_STAT = MIDI_STAT_TX_EVT;
 
-		if(!(irq_pending() & IRQ_MIDIRX)) {
+
+		if(CSR_MIDI_STAT & MIDI_STAT_RX_EVT) {
 			printf("Failed: RX receive problem\n");
 			result = TEST_STATUS_FAILED;
 		}
@@ -53,7 +54,7 @@ static int loopback()
 			printf("Failed: TX: %d, but RX: %d\n", c, CSR_MIDI_RXTX);
 			result = TEST_STATUS_FAILED;
 		}
-		irq_ack(IRQ_MIDIRX);
+		CSR_MIDI_STAT = MIDI_STAT_RX_EVT;
 		c++;
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -29,22 +29,23 @@ static int loopback()`
`29`	`29`	`int result = TEST_STATUS_PASSED;`
`30`	`30`
`31`	`31`	`printf("press 'e' exit MIDI test\n");`
`32`		`- irq_ack(IRQ_MIDITX\|IRQ_MIDIRX);`
	`32`	`+ irq_ack(IRQ_MIDI);`
`33`	`33`	`while(1) {`
`34`	`34`	`if (c == 256) {`
`35`	`35`	`printf("0 ~ 255 sent out, press 'e' for exit\n");`
`36`	`36`	`c = 0;`
`37`	`37`	`}`
`38`	`38`	`CSR_MIDI_RXTX = c;`
`39`		`- while(!(irq_pending() & IRQ_MIDITX)) {`
	`39`	`+ while(!(CSR_MIDI_STAT & MIDI_STAT_TX_EVT)) {`
`40`	`40`	`if(readchar_nonblock()) {`
`41`	`41`	`e = readchar();`
`42`	`42`	`if(e == 'e') return result;`
`43`	`43`	`}`
`44`	`44`	`}`
`45`		`- irq_ack(IRQ_MIDITX);`
	`45`	`+ CSR_MIDI_STAT = MIDI_STAT_TX_EVT;`
`46`	`46`
`47`		`- if(!(irq_pending() & IRQ_MIDIRX)) {`
	`47`	`+`
	`48`	`+ if(CSR_MIDI_STAT & MIDI_STAT_RX_EVT) {`
`48`	`49`	`printf("Failed: RX receive problem\n");`
`49`	`50`	`result = TEST_STATUS_FAILED;`
`50`	`51`	`}`
`@@ -53,7 +54,7 @@ static int loopback()`
`53`	`54`	`printf("Failed: TX: %d, but RX: %d\n", c, CSR_MIDI_RXTX);`
`54`	`55`	`result = TEST_STATUS_FAILED;`
`55`	`56`	`}`
`56`		`- irq_ack(IRQ_MIDIRX);`
	`57`	`+ CSR_MIDI_STAT = MIDI_STAT_RX_EVT;`
`57`	`58`	`c++;`
`58`	`59`	`}`
`59`	`60`