Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaning up commented out code. Formatting according to style rules.

Browse Source
This commit is contained in:
ober 2007-12-09 03:33:29 +00:00
parent 6797f052ff
commit 02ade29d04
4 changed files with 60 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/arch/bebox/bebox/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.17 2007/12/05 12:31:25 tsutsui Exp $ */
/* $NetBSD: autoconf.c,v 1.18 2007/12/09 03:33:29 ober Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.17 2007/12/05 12:31:25 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.18 2007/12/09 03:33:29 ober Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -59,25 +59,13 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.17 2007/12/05 12:31:25 tsutsui Exp $"
#include <machine/pte.h>
#include <machine/intr.h>
/*
#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsiconf.h>
#include <dev/ata/atavar.h>
#include <dev/ic/wdcvar.h>
#include <machine/isa_machdep.h>
#include <dev/isa/isareg.h>
#include <prep/pnpbus/pnpbusvar.h>
*/
void genppc_cpu_configure(void);
static void findroot(void);
/*
* Determine i/o configuration for a machine.
*/
void
cpu_configure()
{
@ -114,10 +102,6 @@ findroot(void)
char buf[32];
const char *name;
#if 0
aprint_normal("howto %x bootdev %x ", boothowto, bootdev);
#endif
if ((bootdev & B_MAGICMASK) != (u_long)B_DEVMAGIC)
return;

4
sys/arch/bebox/bebox/cpu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.c,v 1.7 2007/10/17 19:53:57 garbled Exp $ */
/* $NetBSD: cpu.c,v 1.8 2007/12/09 03:33:29 ober Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.7 2007/10/17 19:53:57 garbled Exp $");
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.8 2007/12/09 03:33:29 ober Exp $");
#include <sys/param.h>
#include <sys/systm.h>

45
sys/arch/bebox/bebox/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.90 2007/10/17 19:53:58 garbled Exp $ */
/* $NetBSD: machdep.c,v 1.91 2007/12/09 03:33:29 ober Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.90 2007/10/17 19:53:58 garbled Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.91 2007/12/09 03:33:29 ober Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@ -155,15 +155,7 @@ initppc(u_long startkernel, u_long endkernel, void *btinfo)
ns_per_tick = 1000000000 / ticks_per_sec;
}
/*
* BeBox MotherBoard's Register
* Interrupt Mask Reset
*/
#if 0
*(volatile u_int *)(MOTHER_BOARD_REG + CPU0_INT_MASK) = 0x0ffffffc;
*(volatile u_int *)(MOTHER_BOARD_REG + CPU0_INT_MASK) = 0x80000023;
*(volatile u_int *)(MOTHER_BOARD_REG + CPU1_INT_MASK) = 0x0ffffffc;
#endif
/*
* boothowto
*/
@ -247,20 +239,6 @@ consinit()
if (!consinfo)
panic("not found console information in bootinfo");
#if 0
#if (NPFB > 0)
if (!strcmp(consinfo->devname, "be")) {
pfb_cnattach(consinfo->addr);
#if (NPCKBC > 0)
pckbc_cnattach(&genppc_isa_io_space_tag, IO_KBD, KBCMDP,
PCKBC_KBD_SLOT);
#endif
return;
}
#endif
#endif /* if 0 */
#if (NPC > 0) || (NVGA > 0)
if (!strcmp(consinfo->devname, "vga")) {
#if (NVGA > 0)
@ -335,9 +313,7 @@ cpu_reboot(int howto, char *what)
if (howto & RB_HALT) {
doshutdownhooks();
printf("halted\n\n");
#if 0
ppc_exit();
#endif
}
if (!cold && (howto & RB_DUMP))
oea_dumpsys();
@ -360,18 +336,5 @@ cpu_reboot(int howto, char *what)
*ap++ = 0;
if (ap[-2] == '-')
*ap1 = 0;
#if 0
ppc_boot(str);
#endif
while (1);
}
#if 0
void
mem_regions(struct mem_region **mem, struct mem_region **avail)
{
*mem = physmemr;
*avail = availmemr;
}
#endif

27
sys/arch/bebox/bebox/mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.20 2007/10/17 19:53:58 garbled Exp $ */
/* $NetBSD: mainbus.c,v 1.21 2007/12/09 03:33:29 ober Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.20 2007/10/17 19:53:58 garbled Exp $");
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21 2007/12/09 03:33:29 ober Exp $");
#include <sys/param.h>
#include <sys/extent.h>
@ -175,29 +175,6 @@ mainbus_attach(struct device *parent, struct device *self, void *aux)
printf("%s\n", prop_dictionary_externalize(pbi->pbi_properties));
#endif
#if 0
#if NPCI > 0
#if defined(PCI_NETBSD_CONFIGURE)
ioext = extent_create("pciio", 0x00008000, 0x0000ffff, M_DEVBUF,
NULL, 0, EX_NOWAIT);
memext = extent_create("pcimem", 0x00000000, 0x0fffffff, M_DEVBUF,
NULL, 0, EX_NOWAIT);
pci_configure_bus(0, ioext, memext, NULL, 0, 32);
extent_destroy(ioext);
extent_destroy(memext);
#endif
mba.mba_pba.pba_iot = &genppc_isa_io_space_tag;
mba.mba_pba.pba_memt = &genppc_isa_mem_space_tag;
mba.mba_pba.pba_dmat = &pci_bus_dma_tag;
mba.mba_pba.pba_dmat64 = NULL;
mba.mba_pba.pba_bus = 0;
mba.mba_pba.pba_bridgetag = NULL;
mba.mba_pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED;
config_found_ia(self, "pcibus", &mba, pcibusprint);
#endif
#endif
}
int