Module Name: src
Committed By: jmcneill
Date: Fri Nov 18 22:18:09 UTC 2011
Modified Files:
src/sys/arch/i386/conf: ALL files.i386
src/sys/arch/i386/i386: machdep.c
src/sys/arch/x86/pci: pci_machdep.c
src/sys/arch/x86/x86: consinit.c
src/sys/arch/xen/conf: files.compat
src/sys/dev/i2c: files.i2c
Removed Files:
src/sys/arch/i386/conf: XBOX
src/sys/arch/i386/include: xbox.h
src/sys/arch/i386/xbox: xbox.c xboxfb.c xboxlcd.c
src/sys/dev/i2c: pic16lc.c xbseeprom.c
Log Message:
remove Xbox support
To generate a diff of this commit:
cvs rdiff -u -r1.325 -r1.326 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.27 -r0 src/sys/arch/i386/conf/XBOX
cvs rdiff -u -r1.361 -r1.362 src/sys/arch/i386/conf/files.i386
cvs rdiff -u -r1.712 -r1.713 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.3 -r0 src/sys/arch/i386/include/xbox.h
cvs rdiff -u -r1.6 -r0 src/sys/arch/i386/xbox/xbox.c
cvs rdiff -u -r1.15 -r0 src/sys/arch/i386/xbox/xboxfb.c
cvs rdiff -u -r1.4 -r0 src/sys/arch/i386/xbox/xboxlcd.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/x86/pci/pci_machdep.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x86/x86/consinit.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/xen/conf/files.compat
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/i2c/files.i2c
cvs rdiff -u -r1.18 -r0 src/sys/dev/i2c/pic16lc.c
cvs rdiff -u -r1.6 -r0 src/sys/dev/i2c/xbseeprom.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/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.325 src/sys/arch/i386/conf/ALL:1.326
--- src/sys/arch/i386/conf/ALL:1.325 Sun Oct 30 12:12:21 2011
+++ src/sys/arch/i386/conf/ALL Fri Nov 18 22:18:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.325 2011/10/30 12:12:21 hannken Exp $
+# $NetBSD: ALL,v 1.326 2011/11/18 22:18:07 jmcneill Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.325 $"
+#ident "ALL-$Revision: 1.326 $"
maxusers 64 # estimated number of users
@@ -39,9 +39,6 @@ powernow0 at cpu0 # AMD PowerNow! and C
viac7temp* at cpu? # VIA C7 temperature sensor
vmt0 at cpu0 # VMware Tools
-# XBOX support
-options XBOX
-
options MTRR # memory-type range register syscall support
# doesn't work with MP just yet..
options PERFCTRS # performance-monitoring counters support
@@ -576,9 +573,6 @@ voodoofb* at pci? dev ? function ?
wcfb* at pci? dev ? function ?
wsdisplay* at wsemuldisplaydev?
-# XBOX framebuffer console
-xboxfb0 at pci? dev ? function ?
-
# DRI driver
i915drm* at drm? # Intel i915, i945 DRM driver
mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver
@@ -704,9 +698,6 @@ lm0 at iic? addr 0x2e flags 0x0
smscmon* at iic? addr 0x2c
#smscmon* at iic? addr 0x2d # (alternate address)
-pic16lc* at iic? addr 0x10 # XBOX PIC16LC
-xbseeprom* at iic? addr 0x54 # XBOX serial EEPROM
-
# IBM Thinkpad Active Protection System
aps0 at isa? port 0x1600
Index: src/sys/arch/i386/conf/files.i386
diff -u src/sys/arch/i386/conf/files.i386:1.361 src/sys/arch/i386/conf/files.i386:1.362
--- src/sys/arch/i386/conf/files.i386:1.361 Sat Aug 27 12:47:49 2011
+++ src/sys/arch/i386/conf/files.i386 Fri Nov 18 22:18:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.i386,v 1.361 2011/08/27 12:47:49 bouyer Exp $
+# $NetBSD: files.i386,v 1.362 2011/11/18 22:18:07 jmcneill Exp $
#
# new style config file for i386 architecture
#
@@ -15,8 +15,8 @@ defparam opt_kernbase.h KERNBASE
# delay before cpu_reset() for reboot.
defparam CPURESET_DELAY
-# Xbox support
-defflag XBOX
+# Obsolete Xbox support
+obsolete defflag XBOX
# VM86 emulation
defflag VM86
@@ -328,17 +328,6 @@ attach apm at apmbus with apmbios: biosc
file arch/i386/i386/apmbios.c apmbios needs-flag
file arch/i386/i386/apmcall.S apmbios
-# XBox LED & system support
-file arch/i386/xbox/xbox.c xbox
-
-# XBox X3LCD support (*very* rudimentary)
-file arch/i386/xbox/xboxlcd.c xbox
-
-# XBox framebuffer support
-device xboxfb: wsemuldisplaydev, rasops32, vcons
-attach xboxfb at pci
-file arch/i386/xbox/xboxfb.c xboxfb needs-flag
-
#
# Compatibility modules
#
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.712 src/sys/arch/i386/i386/machdep.c:1.713
--- src/sys/arch/i386/i386/machdep.c:1.712 Thu Nov 10 00:12:04 2011
+++ src/sys/arch/i386/i386/machdep.c Fri Nov 18 22:18:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.712 2011/11/10 00:12:04 jym Exp $ */
+/* $NetBSD: machdep.c,v 1.713 2011/11/18 22:18:08 jmcneill Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.712 2011/11/10 00:12:04 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.713 2011/11/18 22:18:08 jmcneill Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@@ -86,7 +86,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include "opt_realmem.h"
#include "opt_user_ldt.h"
#include "opt_vm86.h"
-#include "opt_xbox.h"
#include "opt_xen.h"
#include "isa.h"
#include "pci.h"
@@ -179,13 +178,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <machine/vm86.h>
#endif
-#ifdef XBOX
-#include <machine/xbox.h>
-
-int arch_i386_is_xbox = 0;
-uint32_t arch_i386_xbox_memsize = 0;
-#endif
-
#include "acpica.h"
#include "apmbios.h"
#include "bioscall.h"
@@ -440,10 +432,6 @@ cpu_startup(void)
*/
consinit();
-#ifdef XBOX
- xbox_startup();
-#endif
-
/*
* Initialize error message buffer (et end of core).
*/
@@ -934,12 +922,6 @@ haltsys:
HYPERVISOR_shutdown();
for (;;);
#endif
-#ifdef XBOX
- if (arch_i386_is_xbox) {
- xbox_poweroff();
- for (;;);
- }
-#endif
#if NACPICA > 0
if (s != IPL_NONE)
splx(s);
@@ -1372,31 +1354,6 @@ init386(paddr_t first_avail)
cpu_info_primary.ci_pae_l3_pdir = (pd_entry_t *)(rcr3() + KERNBASE);
#endif /* PAE && !XEN */
-#ifdef XBOX
- /*
- * From Rink Springer @ FreeBSD:
- *
- * The following code queries the PCI ID of 0:0:0. For the XBOX,
- * This should be 0x10de / 0x02a5.
- *
- * This is exactly what Linux does.
- */
- outl(0xcf8, 0x80000000);
- if (inl(0xcfc) == 0x02a510de) {
- arch_i386_is_xbox = 1;
- xbox_lcd_init();
- xbox_lcd_writetext("NetBSD/i386 ");
-
- /*
- * We are an XBOX, but we may have either 64MB or 128MB of
- * memory. The PCI host bridge should be programmed for this,
- * so we just query it.
- */
- outl(0xcf8, 0x80000084);
- arch_i386_xbox_memsize = (inl(0xcfc) == 0x7FFFFFF) ? 128 : 64;
- }
-#endif /* XBOX */
-
#if NISA > 0 || NPCI > 0
x86_bus_space_init();
#endif
@@ -1685,12 +1642,6 @@ cpu_reset(void)
struct region_descriptor region;
x86_disable_intr();
-#ifdef XBOX
- if (arch_i386_is_xbox) {
- xbox_reboot();
- for (;;);
- }
-#endif
/*
* Ensure the NVRAM reset byte contains something vaguely sane.
Index: src/sys/arch/x86/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.52 src/sys/arch/x86/pci/pci_machdep.c:1.53
--- src/sys/arch/x86/pci/pci_machdep.c:1.52 Tue Oct 18 23:43:36 2011
+++ src/sys/arch/x86/pci/pci_machdep.c Fri Nov 18 22:18:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.52 2011/10/18 23:43:36 dyoung Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.53 2011/11/18 22:18:08 jmcneill Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.52 2011/10/18 23:43:36 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.53 2011/11/18 22:18:08 jmcneill Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -139,13 +139,6 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
#include "opt_pci_conf_mode.h"
-#ifdef __i386__
-#include "opt_xbox.h"
-#ifdef XBOX
-#include <machine/xbox.h>
-#endif
-#endif
-
#ifdef PCI_CONF_MODE
#if (PCI_CONF_MODE == 1) || (PCI_CONF_MODE == 2)
static int pci_mode = PCI_CONF_MODE;
@@ -389,20 +382,6 @@ pci_attach_hook(device_t parent, device_
int
pci_bus_maxdevs(pci_chipset_tag_t pc, int busno)
{
-
-#if defined(__i386__) && defined(XBOX)
- /*
- * Scanning above the first device is fatal on the Microsoft Xbox.
- * If busno=1, only allow for one device.
- */
- if (arch_i386_is_xbox) {
- if (busno == 1)
- return 1;
- else if (busno > 1)
- return 0;
- }
-#endif
-
/*
* Bus number is irrelevant. If Configuration Mechanism 2 is in
* use, can only have devices 0-15 on any bus. If Configuration
@@ -500,15 +479,6 @@ pci_conf_read(pci_chipset_tag_t pc, pcit
return (*ipc->pc_ov->ov_conf_read)(ipc->pc_ctx, pc, tag, reg);
}
-#if defined(__i386__) && defined(XBOX)
- if (arch_i386_is_xbox) {
- int bus, dev, fn;
- pci_decompose_tag(pc, tag, &bus, &dev, &fn);
- if (bus == 0 && dev == 0 && (fn == 1 || fn == 2))
- return (pcireg_t)-1;
- }
-#endif
-
pci_conf_lock(&ocl, pci_conf_selector(tag, reg));
data = inl(pci_conf_port(tag, reg));
pci_conf_unlock(&ocl);
@@ -531,15 +501,6 @@ pci_conf_write(pci_chipset_tag_t pc, pci
return;
}
-#if defined(__i386__) && defined(XBOX)
- if (arch_i386_is_xbox) {
- int bus, dev, fn;
- pci_decompose_tag(pc, tag, &bus, &dev, &fn);
- if (bus == 0 && dev == 0 && (fn == 1 || fn == 2))
- return;
- }
-#endif
-
pci_conf_lock(&ocl, pci_conf_selector(tag, reg));
outl(pci_conf_port(tag, reg), data);
pci_conf_unlock(&ocl);
Index: src/sys/arch/x86/x86/consinit.c
diff -u src/sys/arch/x86/x86/consinit.c:1.22 src/sys/arch/x86/x86/consinit.c:1.23
--- src/sys/arch/x86/x86/consinit.c:1.22 Fri Jul 1 18:21:31 2011
+++ src/sys/arch/x86/x86/consinit.c Fri Nov 18 22:18:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.22 2011/07/01 18:21:31 dyoung Exp $ */
+/* $NetBSD: consinit.c,v 1.23 2011/11/18 22:18:08 jmcneill Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.22 2011/07/01 18:21:31 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.23 2011/11/18 22:18:08 jmcneill Exp $");
#include "opt_kgdb.h"
@@ -70,13 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v
#include <dev/wsfb/genfbvar.h>
#endif
-#ifdef __i386__
-#include "xboxfb.h"
-#if (NXBOXFB > 0)
-#include <machine/xbox.h>
-#endif
-#endif
-
#include "com.h"
#if (NCOM > 0)
#include <sys/termios.h>
@@ -177,18 +170,6 @@ consinit(void)
}
genfb_disable();
#endif
-#if (NXBOXFB > 0)
- switch (xboxfb_cnattach()) {
- case 0:
- goto dokbd;
- case 1:
- break;
- case -1:
- /* defer initialization until later */
- initted = 0;
- return;
- }
-#endif
#if (NVGA > 0)
if (!vga_cnattach(x86_bus_space_io, x86_bus_space_mem,
-1, 1))
Index: src/sys/arch/xen/conf/files.compat
diff -u src/sys/arch/xen/conf/files.compat:1.22 src/sys/arch/xen/conf/files.compat:1.23
--- src/sys/arch/xen/conf/files.compat:1.22 Sat Oct 3 20:56:39 2009
+++ src/sys/arch/xen/conf/files.compat Fri Nov 18 22:18:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.compat,v 1.22 2009/10/03 20:56:39 jmcneill Exp $
+# $NetBSD: files.compat,v 1.23 2011/11/18 22:18:08 jmcneill Exp $
# NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
# options for MP configuration through the MP spec
@@ -48,9 +48,6 @@ defflag opt_largepages.h XXXLARGEPAGES
# kernel stack debug
defflag opt_kstack_dr0.h XXXKSTACK_CHECK_DR0
-# Microsoft Xbox support
-defflag opt_xbox.h XXXXBOX
-
#Pentium 4+ Thermal Monitor ODCM (aka On Demand Clock Modulation)
defflag opt_intel_odcm.h XXXINTEL_ONDEMAND_CLOCKMOD
Index: src/sys/dev/i2c/files.i2c
diff -u src/sys/dev/i2c/files.i2c:1.44 src/sys/dev/i2c/files.i2c:1.45
--- src/sys/dev/i2c/files.i2c:1.44 Mon Oct 3 22:27:23 2011
+++ src/sys/dev/i2c/files.i2c Fri Nov 18 22:18:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.i2c,v 1.44 2011/10/03 22:27:23 jmcneill Exp $
+# $NetBSD: files.i2c,v 1.45 2011/11/18 22:18:08 jmcneill Exp $
obsolete defflag opt_i2cbus.h I2C_SCAN
define i2cbus { }
@@ -143,16 +143,6 @@ attach sgsmix at iic
file dev/i2c/sgsmix.c sgsmix needs-flag
defflag opt_sgsmix.h SGSMIX_DEBUG
-# Xbox PIC16LC System Management Controller
-device pic16lc: sysmon_envsys
-attach pic16lc at iic
-file dev/i2c/pic16lc.c pic16lc needs-flag
-
-# Xbox Serial EEPROM
-device xbseeprom
-attach xbseeprom at iic
-file dev/i2c/xbseeprom.c xbseeprom
-
# Memory Serial Presence Detect
attach spdmem at iic with spdmem_iic
file dev/i2c/spdmem_i2c.c spdmem_iic
