sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-01-24 00:33:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Testing Inter container IPC for UART service

Browse Source
This commit is contained in:
Amit Mahajan
2009-11-25 12:24:53 +05:30
parent a10a77a0a0
commit b53cc73747
6 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,9 +122,9 @@ int cap_read_all()
"complete CAP_CONTROL_READ_CAPS request.\n");
BUG();
}
#if 0
cap_array_print(&caparray);
#endif
return 0;
}
@@ -149,7 +149,7 @@ int uart_probe_devices(void)
if (uarts != UARTS_TOTAL) {
printf("%s: Error, not all uarts could be found. "
"uarts=%d\n", __CONTAINER_NAME__, uarts);
BUG();
return -ENODEV;
}
return 0;
}
@@ -158,8 +158,6 @@ static struct pl011_uart uart[UARTS_TOTAL];
int uart_setup_devices(void)
{
BUG(); /* Make sure to have set the device capability size as well */
for (int i = 0; i < UARTS_TOTAL; i++) {
/* Map uart to a virtual address region */
if (IS_ERR(uart[i].base =
@@ -177,6 +175,7 @@ int uart_setup_devices(void)
/* Initialize uart */
pl011_initialise(&uart[i]);
}
return 0;
}
static struct address_pool device_vaddr_pool;
@@ -207,10 +206,8 @@ void init_vaddr_pool(void)
* We may allocate virtual memory
* addresses from this pool.
*/
address_pool_init(&device_vaddr_pool,
(unsigned long)__end,
__pfn_to_addr(caparray[i].end),
UARTS_TOTAL);
address_pool_init(&device_vaddr_pool, page_align_up(__end),
__pfn_to_addr(caparray[i].end), UARTS_TOTAL);
return;
} else
goto out_err;
@@ -226,7 +223,7 @@ out_err:
void uart_generic_tx(char c, int devno)
{
pl011_tx_char(uart[devno].base, *c);
}
char uart_generic_rx(int devno)
@@ -234,7 +231,6 @@ char uart_generic_rx(int devno)
return 0;
}
void handle_requests(void)
{
l4id_t senderid;
@@ -265,10 +261,10 @@ void handle_requests(void)
*/
switch (tag) {
case L4_IPC_TAG_UART_SENDCHAR:
uart_generic_tx(0, 0); /*FIXME: Fill in */
uart_generic_tx(0, 1); /*FIXME: Fill in */
break;
case L4_IPC_TAG_UART_RECVCHAR:
uart_generic_rx(0); /* FIXME: Fill in */
uart_generic_rx(1); /* FIXME: Fill in */
break;
default:
printf("%s: Error received ipc from 0x%x residing "

2
conts/libl4/include/l4lib/addr.h
View File

@@ -20,7 +20,7 @@ int address_pool_init_with_idpool(struct address_pool *pool,
unsigned long start, unsigned long end);
int address_pool_init(struct address_pool *pool,
unsigned long start, unsigned long end,
int size);
unsigned int size);
void *address_new(struct address_pool *pool, int nitems, int size);
int address_del(struct address_pool *, void *addr, int nitems, int size);

4
conts/libl4/src/addr.c
View File

@@ -24,9 +24,9 @@ int address_pool_init_with_idpool(struct address_pool *pool,
int address_pool_init(struct address_pool *pool,
unsigned long start, unsigned long end,
int size)
unsigned int size)
{
if ((pool->idpool = id_pool_new_init((end - start) / size)) < 0)
if ((pool->idpool = id_pool_new_init(__pfn(end - start) / size)) < 0)
return (int)pool->idpool;
pool->start = start;
pool->end = end;