diff options
| author | bouyer <bouyer@NetBSD.org> | 2017-12-04 09:55:37 +0000 |
|---|---|---|
| committer | bouyer <bouyer@NetBSD.org> | 2017-12-04 09:55:37 +0000 |
| commit | dedde388ffe271900fd98def7afb4a5cc7ea2b27 (patch) | |
| tree | fc9ebb935fe9ef00c11e97fd8cdc7171ad414e22 /sys/dev | |
| parent | 752ff2bd4964662cebfc1b8e9017b234b4c40cee (diff) | |
Put back SUNXI definitions in the COM_REGMAP case; com.c uses them
without #ifdef COM_AWIN.
To be safe, expand the register map to 42 entries.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/com.c | 9 | ||||
| -rw-r--r-- | sys/dev/ic/comvar.h | 12 |
2 files changed, 11 insertions, 10 deletions
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c index 17b4a4007ac..1516edb6f44 100644 --- a/sys/dev/ic/com.c +++ b/sys/dev/ic/com.c @@ -1,4 +1,4 @@ -/* $NetBSD: com.c,v 1.345 2017/10/31 10:45:19 martin Exp $ */ +/* $NetBSD: com.c,v 1.346 2017/12/04 09:55:37 bouyer Exp $ */ /*- * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.345 2017/10/31 10:45:19 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.346 2017/12/04 09:55:37 bouyer Exp $"); #include "opt_com.h" #include "opt_ddb.h" @@ -253,9 +253,10 @@ void com_kgdb_putc(void *, int); #define COM_REG_STD { \ com_data, com_data, com_dlbl, com_dlbh, com_ier, com_iir, com_fifo, \ com_efr, com_lcr, com_mcr, com_lsr, com_msr, 0, 0, 0, 0, 0, 0, 0, 0, \ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, com_usr } + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, com_usr, com_tfl, com_rfl, \ + 0, 0, 0, 0, 0, 0, 0, com_halt } -const bus_size_t com_std_map[32] = COM_REG_STD; +const bus_size_t com_std_map[42] = COM_REG_STD; #endif /* COM_REGMAP */ #define COMDIALOUT_MASK TTDIALOUT_MASK diff --git a/sys/dev/ic/comvar.h b/sys/dev/ic/comvar.h index ee02f6448fc..7fe00839bc7 100644 --- a/sys/dev/ic/comvar.h +++ b/sys/dev/ic/comvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: comvar.h,v 1.85 2017/12/04 09:14:23 bouyer Exp $ */ +/* $NetBSD: comvar.h,v 1.86 2017/12/04 09:55:37 bouyer Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -92,19 +92,19 @@ int com_is_console(bus_space_tag_t, bus_addr_t, bus_space_handle_t *); #define COM_REG_LSR 10 #define COM_REG_MSR 11 #define COM_REG_USR 31 /* 16750/SUNXI */ -#ifdef COM_AWIN -#error "COM_AWIN not compatible with COM_REGMAP" -#endif +#define COM_REG_TFL com_tfl /* SUNXI */ +#define COM_REG_RFL com_rfl /* SUNXI */ +#define COM_REG_HALT com_halt /* SUNXI */ struct com_regs { bus_space_tag_t cr_iot; bus_space_handle_t cr_ioh; bus_addr_t cr_iobase; bus_size_t cr_nports; - bus_size_t cr_map[32]; + bus_size_t cr_map[42]; }; -extern const bus_size_t com_std_map[32]; +extern const bus_size_t com_std_map[42]; #define COM_INIT_REGS(regs, tag, hdl, addr) \ do { \ |
