summaryrefslogtreecommitdiff
path: root/sys/dev/ic/comvar.h
diff options
context:
space:
mode:
authorbouyer <bouyer@NetBSD.org>2017-12-04 09:55:37 +0000
committerbouyer <bouyer@NetBSD.org>2017-12-04 09:55:37 +0000
commitdedde388ffe271900fd98def7afb4a5cc7ea2b27 (patch)
treefc9ebb935fe9ef00c11e97fd8cdc7171ad414e22 /sys/dev/ic/comvar.h
parent752ff2bd4964662cebfc1b8e9017b234b4c40cee (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/ic/comvar.h')
-rw-r--r--sys/dev/ic/comvar.h12
1 files changed, 6 insertions, 6 deletions
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 { \