diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/octeon/dev/cn30xxuart.c | 8 | ||||
| -rw-r--r-- | sys/arch/octeon/octeon/machdep.c | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sys/arch/octeon/dev/cn30xxuart.c b/sys/arch/octeon/dev/cn30xxuart.c index 5db18e8e04b..1662ed29e87 100644 --- a/sys/arch/octeon/dev/cn30xxuart.c +++ b/sys/arch/octeon/dev/cn30xxuart.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxuart.c,v 1.2 2013/06/02 19:47:32 jasper Exp $ */ +/* $OpenBSD: cn30xxuart.c,v 1.3 2013/06/05 01:32:22 jasper Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -140,7 +140,7 @@ cn30xxuart_attach(struct device *parent, struct device *self, void *aux) /* * Early console routines. */ -int +int cn30xxuart_delay(void) { int divisor; @@ -151,10 +151,10 @@ cn30xxuart_delay(void) delay_changed = 0; lcr = (u_char)*(uint64_t*)OCTEON_MIO_UART0_LCR; *(uint64_t*)OCTEON_MIO_UART0_LCR = lcr | LCR_DLAB; - divisor = (int)(*(uint64_t*)OCTEON_MIO_UART0_DLL | + divisor = (int)(*(uint64_t*)OCTEON_MIO_UART0_DLL | *(uint64_t*)OCTEON_MIO_UART0_DLH << 8); *(uint64_t*)OCTEON_MIO_UART0_LCR = lcr; - + return 10; /* return an approx delay value */ } diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c index 9018bcd74a7..bf7bbf53915 100644 --- a/sys/arch/octeon/octeon/machdep.c +++ b/sys/arch/octeon/octeon/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.36 2013/06/02 20:29:36 jasper Exp $ */ +/* $OpenBSD: machdep.c,v 1.37 2013/06/05 01:32:22 jasper Exp $ */ /* * Copyright (c) 2009, 2010 Miodrag Vallat. @@ -118,16 +118,16 @@ caddr_t ekern; struct phys_mem_desc mem_layout[MAXMEMSEGS]; -void dumpsys(void); -void dumpconf(void); -vaddr_t mips_init(__register_t, __register_t, __register_t, __register_t); -boolean_t is_memory_range(paddr_t, psize_t, psize_t); -void octeon_memory_init(struct boot_info *); -int octeon_cpuspeed(int *); +void dumpsys(void); +void dumpconf(void); +vaddr_t mips_init(__register_t, __register_t, __register_t, __register_t); +boolean_t is_memory_range(paddr_t, psize_t, psize_t); +void octeon_memory_init(struct boot_info *); +int octeon_cpuspeed(int *); static void process_bootargs(void); static uint64_t get_ncpusfound(void); -extern void parse_uboot_root(void); +extern void parse_uboot_root(void); cons_decl(cn30xxuart); struct consdev uartcons = cons_init(cn30xxuart); |