Module Name: src
Committed By: bouyer
Date: Mon Dec 4 09:55:37 UTC 2017
Modified Files:
src/sys/dev/ic: com.c comvar.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.345 -r1.346 src/sys/dev/ic/com.c
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/ic/comvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/com.c
diff -u src/sys/dev/ic/com.c:1.345 src/sys/dev/ic/com.c:1.346
--- src/sys/dev/ic/com.c:1.345 Tue Oct 31 10:45:19 2017
+++ src/sys/dev/ic/com.c Mon Dec 4 09:55:37 2017
@@ -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
Index: src/sys/dev/ic/comvar.h
diff -u src/sys/dev/ic/comvar.h:1.85 src/sys/dev/ic/comvar.h:1.86
--- src/sys/dev/ic/comvar.h:1.85 Mon Dec 4 09:14:23 2017
+++ src/sys/dev/ic/comvar.h Mon Dec 4 09:55:37 2017
@@ -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_
#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 { \
