[src/trunk]: src/sys/arch/arc/arc Make this compile without com.

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

details:   https://anonhg.NetBSD.org/src/rev/2cde883973a6
branches:  trunk
changeset: 507730:2cde883973a6
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Fri Mar 30 16:32:02 2001 +0000

description:
Make this compile without com.

diffstat:

 sys/arch/arc/arc/machdep.c |  24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diffs (124 lines):

diff -r e5aac0518c5d -r 2cde883973a6 sys/arch/arc/arc/machdep.c
--- a/sys/arch/arc/arc/machdep.c        Fri Mar 30 16:12:44 2001 +0000
+++ b/sys/arch/arc/arc/machdep.c        Fri Mar 30 16:32:02 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.51 2001/03/30 09:10:48 ur Exp $  */
+/*     $NetBSD: machdep.c,v 1.52 2001/03/30 16:32:02 tsutsui Exp $     */
 /*     $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $   */
 
 /*
@@ -151,6 +151,7 @@
 #define COMCONSOLE     0
 #endif
 
+#if NCOM > 0
 #ifndef COM_FREQ_MAGNUM
 #if 0
 #define COM_FREQ_MAGNUM        4233600 /* 4.2336MHz - ARC? */
@@ -159,7 +160,6 @@
 #endif
 #endif /* COM_FREQ_MAGNUM */
 
-#if NCOM > 0
 #ifndef CONSPEED
 #define CONSPEED TTYDEF_SPEED
 #endif
@@ -196,11 +196,13 @@
 struct arc_bus_space arc_bus_io;/* Bus tag for bus.h macros */
 struct arc_bus_space arc_bus_mem;/* Bus tag for bus.h macros */
 struct arc_bus_space pica_bus; /* picabus for com.c/com_lbus.c */
+#if NCOM > 0
 int    com_freq = COM_FREQ;    /* unusual clock frequency of dev/ic/com.c */
 int    com_console_address;    /* Well, ain't it just plain stupid... */
 bus_space_tag_t comconstag = &arc_bus_io;      /* com console bus */
+struct arc_bus_space *arc_bus_com = &arc_bus_io; /* com bus */
+#endif
 int    com_console = COMCONSOLE;
-struct arc_bus_space *arc_bus_com = &arc_bus_io; /* com bus */
 char   **environment;          /* On some arches, pointer to environment */
 char   eth_hw_addr[6];         /* HW ether addr not stored elsewhere */
 
@@ -297,7 +299,9 @@
                        break;
                case MAGNUM:
                        strcpy(cpu_model, "MIPS Magnum");
+#if NCOM > 0
                        com_freq = COM_FREQ_MAGNUM;
+#endif
                        break;
                }
 
@@ -309,9 +313,11 @@
                arc_bus_space_init(&arc_bus_mem, "picaisamem",
                    PICA_P_ISA_MEM, PICA_V_ISA_MEM, 0, PICA_S_ISA_MEM);
 
+#if NCOM > 0
                arc_bus_com = &pica_bus;
                comconstag = &pica_bus;
                com_console_address = PICA_SYS_COM1;
+#endif
 
                /*
                 * Set up interrupt handling and I/O addresses.
@@ -389,9 +395,11 @@
                        break;
                }
 
+#if NCOM > 0
                arc_bus_com = &pica_bus;
                comconstag = &pica_bus;
                com_console_address = RD94_SYS_COM1;
+#endif
 
                /*
                 * Set up interrupt handling and I/O addresses.
@@ -412,7 +420,9 @@
                arc_bus_space_init(&arc_bus_mem, "rpc44isamem",
                    RPC44_P_ISA_MEM, RPC44_V_ISA_MEM, 0, RPC44_S_ISA_MEM);
 
+#if NCOM > 0
                com_console_address = 0; /* Don't screew the mouse... */
+#endif
 
                /*
                 * XXX
@@ -431,7 +441,9 @@
                arc_bus_space_init(&arc_bus_mem, "tyneisamem",
                    TYNE_P_ISA_MEM, TYNE_V_ISA_MEM, 0, TYNE_S_ISA_MEM);
 
+#if NCOM > 0
                com_console_address = 0; /* Don't screew the mouse... */
+#endif
 
                /*
                 * XXX
@@ -450,7 +462,9 @@
                arc_bus_space_init(&arc_bus_mem, "rm200isamem",
                    RM200_P_ISA_MEM, RM200_V_ISA_MEM, 0, RM200_S_ISA_MEM);
 #endif
+#if NCOM > 0
                com_console_address = 0; /* Don't screew the mouse... */
+#endif
                break;
 
        case -1:        /* Not identified as an ARC system. We have a couple */
@@ -466,15 +480,19 @@
                    MIPS_KSEG1_START, MIPS_KSEG2_START - MIPS_KSEG1_START);
                /* stride: (1 << 2) == 4 byte alignment */
                arc_bus_space_set_aligned_stride(&arc_bus_io, 2);
+#if NCOM > 0
                com_console_address = P4032_COM1;
+#endif
 #else
                cputype = ALGOR_P5064;
                strcpy(cpu_model, "Algorithmics P-5064");
                arc_bus_space_init(&arc_bus_io, "p5064bus",
                    0LL, MIPS_KSEG1_START,
                    MIPS_KSEG1_START, MIPS_KSEG2_START - MIPS_KSEG1_START);
+#if NCOM > 0
                com_console_address = P5064_COM1;
 #endif
+#endif
 
                mem_clusters[0].start = 0;
                mem_clusters[0].size =