Merge branch 'develop' of https://git.minres.com/Firmware/MNRS-BM-BSP.git into develop
This commit is contained in:
commit
28bf59f0e3
|
@ -17,7 +17,7 @@ int __wrap_puts(const char *s)
|
||||||
uart_write(uart, *s);
|
uart_write(uart, *s);
|
||||||
#elif defined(BOARD_iss)
|
#elif defined(BOARD_iss)
|
||||||
*((uint32_t*) 0xFFFF0000) = *s;
|
*((uint32_t*) 0xFFFF0000) = *s;
|
||||||
#elif defined(BOARD_TGC5L)
|
#elif defined(BOARD_TGCP)
|
||||||
//TODO: implement
|
//TODO: implement
|
||||||
#else
|
#else
|
||||||
while (UART0_REG(UART_REG_TXFIFO) & 0x80000000) ;
|
while (UART0_REG(UART_REG_TXFIFO) & 0x80000000) ;
|
||||||
|
|
|
@ -19,7 +19,7 @@ ssize_t __wrap_read(int fd, void* ptr, size_t len)
|
||||||
volatile uint8_t * uart_rx_cnt = (uint8_t *)(UART0_CTRL_ADDR + UART_REG_RXCTRL + 2);
|
volatile uint8_t * uart_rx_cnt = (uint8_t *)(UART0_CTRL_ADDR + UART_REG_RXCTRL + 2);
|
||||||
#elif defined(BOARD_iss)
|
#elif defined(BOARD_iss)
|
||||||
volatile uint32_t * uart_rx = (uint32_t*)0xFFFF0000;
|
volatile uint32_t * uart_rx = (uint32_t*)0xFFFF0000;
|
||||||
#elif defined(BOARD_TGC5L)
|
#elif defined(BOARD_TGCP)
|
||||||
//TODO: implement
|
//TODO: implement
|
||||||
#elif !defined(BOARD_ehrenberg)
|
#elif !defined(BOARD_ehrenberg)
|
||||||
volatile uint32_t * uart_rx = (uint32_t *)(UART0_BASE_ADDR + UART_REG_RXFIFO);
|
volatile uint32_t * uart_rx = (uint32_t *)(UART0_BASE_ADDR + UART_REG_RXFIFO);
|
||||||
|
@ -41,7 +41,7 @@ ssize_t __wrap_read(int fd, void* ptr, size_t len)
|
||||||
*current = *uart_rx;
|
*current = *uart_rx;
|
||||||
result++;
|
result++;
|
||||||
}
|
}
|
||||||
#elif defined(BOARD_TGC5L)
|
#elif defined(BOARD_TGCP)
|
||||||
//TODO: implement
|
//TODO: implement
|
||||||
#else
|
#else
|
||||||
for (current = (uint8_t *)ptr;
|
for (current = (uint8_t *)ptr;
|
||||||
|
|
|
@ -22,7 +22,7 @@ ssize_t __wrap_write(int fd, const void* ptr, size_t len)
|
||||||
}
|
}
|
||||||
#elif defined(BOARD_iss)
|
#elif defined(BOARD_iss)
|
||||||
*((uint32_t*) 0xFFFF0000) = current[jj];
|
*((uint32_t*) 0xFFFF0000) = current[jj];
|
||||||
#elif defined(BOARD_TGC5L)
|
#elif defined(BOARD_TGCP)
|
||||||
//TODO: implement
|
//TODO: implement
|
||||||
#else
|
#else
|
||||||
while (UART0_REG(UART_REG_TXFIFO) & 0x80000000) ;
|
while (UART0_REG(UART_REG_TXFIFO) & 0x80000000) ;
|
||||||
|
|
Loading…
Reference in New Issue