sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-04-28 22:51:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Style fixes to uart service sources

Browse Source
This commit is contained in:
Bahadir Balban
2009-11-29 23:38:38 +02:00
parent 346d79c0cd
commit f4989ab2d2
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
conts/baremetal/baremetal4/main.c
View File

@@ -162,11 +162,12 @@ int uart_setup_devices(void)
for (int i = 0; i < UARTS_TOTAL; i++) { for (int i = 0; i < UARTS_TOTAL; i++) {
/* Get one page from address pool */ /* Get one page from address pool */
uart[i].base = (unsigned long)l4_new_virtual(1); uart[i].base = (unsigned long)l4_new_virtual(1);
/* Map uart to a virtual address region */ /* Map uart to a virtual address region */
if (IS_ERR(l4_map((void *)__pfn_to_addr(uart_cap[i].start), if (IS_ERR(l4_map((void *)__pfn_to_addr(uart_cap[i].start),
(void *)uart[i].base, uart_cap[i].size, MAP_USR_IO_FLAGS, (void *)uart[i].base, uart_cap[i].size,
self_tid()))) { MAP_USR_IO_FLAGS,
self_tid()))) {
printf("%s: FATAL: Failed to map UART device " printf("%s: FATAL: Failed to map UART device "
"%d to a virtual address\n", "%d to a virtual address\n",
__CONTAINER_NAME__, __CONTAINER_NAME__,
@@ -225,7 +226,6 @@ out_err:
void *l4_new_virtual(int npages) void *l4_new_virtual(int npages)
{ {
return address_new(&device_vaddr_pool, npages, PAGE_SIZE); return address_new(&device_vaddr_pool, npages, PAGE_SIZE);
} }
@@ -237,9 +237,9 @@ void uart_generic_tx(char c, int devno)
char uart_generic_rx(int devno) char uart_generic_rx(int devno)
{ {
char c; char c;
pl011_rx_char(uart[devno].base, &c); pl011_rx_char(uart[devno].base, &c);
return c; return c;
} }
@@ -251,15 +251,15 @@ void handle_requests(void)
printf("%s: Initiating ipc.\n", __CONTAINER__); printf("%s: Initiating ipc.\n", __CONTAINER__);
if ((ret = l4_receive(L4_ANYTHREAD)) < 0) { if ((ret = l4_receive(L4_ANYTHREAD)) < 0) {
printf("%s: %s: IPC Error: %d. Quitting...\n", __CONTAINER__, printf("%s: %s: IPC Error: %d. Quitting...\n",
__FUNCTION__, ret); __CONTAINER__, __FUNCTION__, ret);
BUG(); BUG();
} }
/* Syslib conventional ipc data which uses first few mrs. */ /* Syslib conventional ipc data which uses first few mrs. */
tag = l4_get_tag(); tag = l4_get_tag();
senderid = l4_get_sender(); senderid = l4_get_sender();
/* /*
* TODO: * TODO:
* *