Module Name: src
Committed By: phx
Date: Sat May 8 19:41:07 UTC 2010
Modified Files:
src/sys/arch/sandpoint/stand/netboot: brdsetup.c globals.h main.c
Log Message:
Support for IOMEGA Storcenter, by Toru Nishimura.
Kurobox console is 57600.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sandpoint/stand/netboot/brdsetup.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sandpoint/stand/netboot/globals.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sandpoint/stand/netboot/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sandpoint/stand/netboot/brdsetup.c
diff -u src/sys/arch/sandpoint/stand/netboot/brdsetup.c:1.10 src/sys/arch/sandpoint/stand/netboot/brdsetup.c:1.11
--- src/sys/arch/sandpoint/stand/netboot/brdsetup.c:1.10 Sat May 8 14:40:08 2010
+++ src/sys/arch/sandpoint/stand/netboot/brdsetup.c Sat May 8 19:41:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: brdsetup.c,v 1.10 2010/05/08 14:40:08 phx Exp $ */
+/* $NetBSD: brdsetup.c,v 1.11 2010/05/08 19:41:07 phx Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -150,7 +150,7 @@
brdtype = BRD_KUROBOX;
consname = "eumb";
consport = 0x4600;
- consspeed = 115200;
+ consspeed = 57600;
}
else if (PCI_VENDOR(pcicfgread(pcimaketag(0, 15, 0), PCI_ID_REG)) ==
0x11ab) { /* PCI_VENDOR_MARVELL */
@@ -166,6 +166,13 @@
consport = 0x4600;
consspeed = 115200;
}
+ else if (PCI_VENDOR(pcicfgread(pcimaketag(0, 15, 0), PCI_ID_REG)) ==
+ 0x10ec) { /* PCI_VENDOR_REALTEK */
+ brdtype = BRD_STORCENTER;
+ consname = "eumb";
+ consport = 0x4600;
+ consspeed = 115200;
+ }
/* determine clock frequencies */
if (busclock == 0) {
@@ -205,6 +212,7 @@
send_sat("247");
break;
case BRD_QNAPTS101:
+ case BRD_STORCENTER:
init_uart(uart2base, 9600, LCR_8BITS | LCR_PNONE);
break;
}
Index: src/sys/arch/sandpoint/stand/netboot/globals.h
diff -u src/sys/arch/sandpoint/stand/netboot/globals.h:1.13 src/sys/arch/sandpoint/stand/netboot/globals.h:1.14
--- src/sys/arch/sandpoint/stand/netboot/globals.h:1.13 Sat May 8 14:40:08 2010
+++ src/sys/arch/sandpoint/stand/netboot/globals.h Sat May 8 19:41:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: globals.h,v 1.13 2010/05/08 14:40:08 phx Exp $ */
+/* $NetBSD: globals.h,v 1.14 2010/05/08 19:41:07 phx Exp $ */
/* clock feed */
#ifndef EXT_CLK_FREQ
@@ -13,6 +13,7 @@
#define BRD_KUROBOX 100
#define BRD_QNAPTS101 101
#define BRD_SYNOLOGY 102
+#define BRD_STORCENTER 103
#define BRD_UNKNOWN -1
extern char *consname;
Index: src/sys/arch/sandpoint/stand/netboot/main.c
diff -u src/sys/arch/sandpoint/stand/netboot/main.c:1.26 src/sys/arch/sandpoint/stand/netboot/main.c:1.27
--- src/sys/arch/sandpoint/stand/netboot/main.c:1.26 Sat May 8 15:26:54 2010
+++ src/sys/arch/sandpoint/stand/netboot/main.c Sat May 8 19:41:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.26 2010/05/08 15:26:54 phx Exp $ */
+/* $NetBSD: main.c,v 1.27 2010/05/08 19:41:07 phx Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -91,6 +91,8 @@
printf("Kuro Box"); break;
case BRD_SYNOLOGY:
printf("Synology DS"); break;
+ case BRD_STORCENTER:
+ printf("IOMEGA StorCenter"); break;
default:
printf("Unknown board"); break;
}
