[src/trunk]: src/sys/dev/ic Put back SUNXI definitions in the COM_REGMAP case...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7f637ab1866f
branches:  trunk
changeset: 357942:7f637ab1866f
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Mon Dec 04 09:55:37 2017 +0000

description:
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:

 sys/dev/ic/com.c    |  11 ++++++-----
 sys/dev/ic/comvar.h |  12 ++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diffs (66 lines):

diff -r e614a525c37e -r 7f637ab1866f sys/dev/ic/com.c
--- a/sys/dev/ic/com.c  Mon Dec 04 09:44:33 2017 +0000
+++ b/sys/dev/ic/com.c  Mon Dec 04 09:55:37 2017 +0000
@@ -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 @@
 #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 }
-
-const bus_size_t com_std_map[32] = COM_REG_STD;
+       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[42] = COM_REG_STD;
 #endif /* COM_REGMAP */
 
 #define        COMDIALOUT_MASK TTDIALOUT_MASK
diff -r e614a525c37e -r 7f637ab1866f sys/dev/ic/comvar.h
--- a/sys/dev/ic/comvar.h       Mon Dec 04 09:44:33 2017 +0000
+++ b/sys/dev/ic/comvar.h       Mon Dec 04 09:55:37 2017 +0000
@@ -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 @@
 #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 {                                                            \