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

Patch for comments by bahadir

Browse Source
This commit is contained in:
Amit Mahajan
2009-11-01 00:51:55 +05:30
parent 52d346af40
commit 8d9f5f82d0
30 changed files with 105 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
loader/libs/c/SConstruct
View File

@@ -11,7 +11,6 @@ variant = "baremetal"
config = configuration_retrieve()
arch = config.arch
subarch = config.subarch
platform = config.platform
gcc_cpu_flag = config.gcc_cpu_flag
env = Environment(CC = config.kernel_toolchain + 'gcc',
@@ -34,7 +33,6 @@ source = \
Glob('src/*.c') + \
Glob('src/sys-' + variant + '/*.c') + \
Glob('src/sys-' + variant + '/arch-' + arch + '/*.c') + \
Glob('src/sys-' + variant + '/arch-' + arch + '/plat-' + platform + '/*.c') + \
Glob('src/arch-' + arch + '/*.c') + \
Glob('src/arch-' + arch + '/*.S') + \
Glob('crt/sys-' + variant + '/arch-' + arch + '/*.[cS]')

2
loader/libs/c/include/arch/pl011_uart.h
View File

@@ -58,7 +58,7 @@
#define PL011_OEIRQ (1 << 10)
/* FIXME: Need to define this somewhere else */
struct pl011_uart;
struct pl011_uart uart;
int pl011_initialise(struct pl011_uart *uart);
int pl011_tx_char(unsigned int base, char c);

0
loader/libs/c/src/sys-baremetal/arch-arm/plat-pb926/platform_init.c → loader/libs/c/src/sys-baremetal/arch-arm/platform_init.c
View File

24
loader/libs/c/src/sys-baremetal/arch-arm/plat-pb926/sys_fputc.c → loader/libs/c/src/sys-baremetal/arch-arm/sys_fputc.c
View File

@@ -105,7 +105,7 @@ extern struct pl011_uart uart;
int pl011_tx_char(unsigned int base, char c)
{
unsigned int val = 0;
read(val, (base + PL011_UARTFR));
if(val & PL011_TXFF) { /* TX FIFO Full */
return -PL011_EAGAIN;
@@ -118,27 +118,27 @@ int pl011_rx_char(unsigned int base, char * c)
{
unsigned int data;
unsigned int val = 0;
read(val, (base + PL011_UARTFR));
if(val & PL011_RXFE) { /* RX FIFO Empty */
return -PL011_EAGAIN;
}
read(data, (base + PL011_UARTDR));
*c = (char) data;
if((data >> 8) & 0xF) { /* There were errors */
return -1; /* Signal error in xfer */
}
return 0; /* No error return */
}
/*
* Sets the baud rate in kbps. It is recommended to use
* standard rates such as: 1200, 2400, 3600, 4800, 7200,
/*
* Sets the baud rate in kbps. It is recommended to use
* standard rates such as: 1200, 2400, 3600, 4800, 7200,
* 9600, 14400, 19200, 28800, 38400, 57600 76800, 115200.
*/
void pl011_set_baudrate(unsigned int base, unsigned int baud,
void pl011_set_baudrate(unsigned int base, unsigned int baud,
unsigned int clkrate)
{
const unsigned int uartclk = 24000000; /* 24Mhz clock fixed on pb926 */
@@ -174,12 +174,12 @@ void pl011_set_baudrate(unsigned int base, unsigned int baud,
void pl011_set_irq_mask(unsigned int base, unsigned int flags)
{
unsigned int val = 0;
if(flags > 0x3FF) {
/* Invalid irqmask bitvector */
return;
}
read(val, (base + PL011_UARTIMSC));
val |= flags;
write(val, (base + PL011_UARTIMSC));
@@ -190,12 +190,12 @@ void pl011_set_irq_mask(unsigned int base, unsigned int flags)
void pl011_clr_irq_mask(unsigned int base, unsigned int flags)
{
unsigned int val = 0;
if(flags > 0x3FF) {
/* Invalid irqmask bitvector */
return;
}
read(val, (base + PL011_UARTIMSC));
val &= ~flags;
write(val, (base + PL011_UARTIMSC));

5
loader/libs/c/src/sys-baremetal/arch-arm/sys_stdio.c
View File

@@ -1,10 +1,9 @@
#include <stdio.h>
#include <stdint.h>
int __fputc(int c, FILE *stream);
extern int __fputc(int c, FILE *stream);
static int
ser_out(int c)
static int ser_out(int c)
{
__fputc(c, 0);
if (c == '\n')