[src/trunk]: src/sys/arch/next68k/stand/boot Determine turbo-ness based on th...

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

details:   https://anonhg.NetBSD.org/src/rev/91ed652fc8f8
branches:  trunk
changeset: 536194:91ed652fc8f8
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Wed Sep 11 02:17:14 2002 +0000

description:
Determine turbo-ness based on the ROM machine type here, too.

diffstat:

 sys/arch/next68k/stand/boot/Makefile |   4 +---
 sys/arch/next68k/stand/boot/boot.c   |  11 ++++++++++-
 sys/arch/next68k/stand/boot/en.c     |   8 +++-----
 sys/arch/next68k/stand/boot/enreg.h  |   6 +-----
 4 files changed, 15 insertions(+), 14 deletions(-)

diffs (108 lines):

diff -r b0d583fad52f -r 91ed652fc8f8 sys/arch/next68k/stand/boot/Makefile
--- a/sys/arch/next68k/stand/boot/Makefile      Wed Sep 11 01:46:29 2002 +0000
+++ b/sys/arch/next68k/stand/boot/Makefile      Wed Sep 11 02:17:14 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2002/09/11 01:46:36 mycroft Exp $
+#      $NetBSD: Makefile,v 1.16 2002/09/11 02:17:14 mycroft Exp $
 
 S=     ${.CURDIR}/../../../..
 
@@ -20,8 +20,6 @@
 
 RELOC= 4380000
 
-DEFS+=         -DDISABLE_NEXT_BMAP_CHIP
-DEFS+=         -g
 # XXX make defs arch-indep.
 INCLUDES+=     -I${.OBJDIR} -I${S}/arch -I${S} -I${S}/lib/libsa 
 DEFS+=         -D_STANDALONE -DMC68040 -DSUPPORT_BOOTP -DSUPPORT_DHCP  -DDEBUG -DSD_DEBUG -DSCSI_DEBUG # -DEN_DEBUG   -DNETIF_DEBUG  
diff -r b0d583fad52f -r 91ed652fc8f8 sys/arch/next68k/stand/boot/boot.c
--- a/sys/arch/next68k/stand/boot/boot.c        Wed Sep 11 01:46:29 2002 +0000
+++ b/sys/arch/next68k/stand/boot/boot.c        Wed Sep 11 02:17:14 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot.c,v 1.6 2002/09/11 01:46:36 mycroft Exp $ */
+/*     $NetBSD: boot.c,v 1.7 2002/09/11 02:17:14 mycroft Exp $ */
 /*
  * Copyright (c) 1994 Rolf Grossmann
  * All rights reserved.
@@ -63,6 +63,7 @@
 #define KNAMEN 100
 char kernel[KNAMEN];
 int entry_point;               /* return value filled in by machdep_start */
+int turbo;
 
 extern void rtc_init(void);
 
@@ -77,13 +78,21 @@
        u_long marks[MARK_MAX];
        int dev;
        char count, lun, part;
+       char machine;
        char *file;
 #ifdef PROCESS_ARGS
        char *kernel_args = MON(char *, MG_boot_dev);
 #endif
 
+       machine = MON(char, MG_machine_type);
+       if (machine == NeXT_TURBO_MONO || machine == NeXT_TURBO_COLOR)
+               turbo = 1;
+       else
+               turbo = 0;
+
        memset(marks, 0, sizeof(marks));
        printf(">> %s BOOT [%s #%d]\n", bootprog_name, bootprog_rev, build);
+       printf(">> type %d, %sturbo\n", machine, turbo ? "" : "non-");
        rtc_init();
 
        try_bootp = 1;
diff -r b0d583fad52f -r 91ed652fc8f8 sys/arch/next68k/stand/boot/en.c
--- a/sys/arch/next68k/stand/boot/en.c  Wed Sep 11 01:46:29 2002 +0000
+++ b/sys/arch/next68k/stand/boot/en.c  Wed Sep 11 02:17:14 2002 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: en.c,v 1.5 2002/09/11 01:46:36 mycroft Exp $        */
+/*      $NetBSD: en.c,v 1.6 2002/09/11 02:17:15 mycroft Exp $        */
 /*
  * Copyright (c) 1996 Rolf Grossmann
  * All rights reserved.
@@ -81,7 +81,7 @@
        en_ifs, NENTS(en_ifs)
 };
 
-int turbo = 1;
+extern int turbo;
 
 /* ### int netdev_sock;
 static int open_count; */
@@ -137,9 +137,7 @@
                er->txmode = EN_TMD_LB_DISABLE;
 
        /* setup for bnc/tp */
-       if (turbo) {
-
-       } else {
+       if (!turbo) {
                DPRINTF (("en_media: %s\n",
                          (bmap_chip[13] & 0x20000000) ? "BNC" : "TP"));
                if (!(bmap_chip[13] & 0x20000000)) {
diff -r b0d583fad52f -r 91ed652fc8f8 sys/arch/next68k/stand/boot/enreg.h
--- a/sys/arch/next68k/stand/boot/enreg.h       Wed Sep 11 01:46:29 2002 +0000
+++ b/sys/arch/next68k/stand/boot/enreg.h       Wed Sep 11 02:17:14 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: enreg.h,v 1.2 2002/09/11 01:46:36 mycroft Exp $        */
+/*     $NetBSD: enreg.h,v 1.3 2002/09/11 02:17:15 mycroft Exp $        */
 /*
  * Copyright (c) 1997 Rolf Grossmann
  * All rights reserved.
@@ -35,12 +35,8 @@
 #define        SLOT_ID_BMAP    0x0
 #endif
 #ifdef MC68040
-#ifdef DISABLE_NEXT_BMAP_CHIP          /* @@@ For turbo testing */
-#define        SLOT_ID_BMAP    0x0
-#else
 #define        SLOT_ID_BMAP    0x00100000
 #endif
-#endif
 
 #define P_ENETX_CSR     ((caddr_t)(SLOT_ID+0x02000110))
 #define P_ENETR_CSR     ((caddr_t)(SLOT_ID+0x02000150))