Module Name: src
Committed By: mrg
Date: Sun Aug 23 01:27:13 UTC 2009
Modified Files:
src/sys/arch/atari/atari: atari_init.c
src/sys/arch/atari/include: iomap.h
src/sys/arch/atari/isa: isa_machdep.c
Log Message:
fix atari builds in two ways:
- isa_detach_hook() was missing a parameter name (hi dyoung!)
- PCI_CONF_SIZE -> PCI_CONFIG_SIZE; pcivar.h has a PCI_CONF_SIZE now (hi jak!)
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/atari/atari/atari_init.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/atari/include/iomap.h
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/atari/isa/isa_machdep.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/atari/atari/atari_init.c
diff -u src/sys/arch/atari/atari/atari_init.c:1.85 src/sys/arch/atari/atari/atari_init.c:1.86
--- src/sys/arch/atari/atari/atari_init.c:1.85 Sat Aug 22 18:26:42 2009
+++ src/sys/arch/atari/atari/atari_init.c Sun Aug 23 01:27:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: atari_init.c,v 1.85 2009/08/22 18:26:42 tsutsui Exp $ */
+/* $NetBSD: atari_init.c,v 1.86 2009/08/23 01:27:13 mrg Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.85 2009/08/22 18:26:42 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.86 2009/08/23 01:27:13 mrg Exp $");
#include "opt_ddb.h"
#include "opt_mbtype.h"
@@ -324,7 +324,7 @@
* If present, add pci areas
*/
if (machineid & ATARI_HADES)
- ptextra += btoc(PCI_CONF_SIZE + PCI_IO_SIZE + PCI_MEM_SIZE);
+ ptextra += btoc(PCI_CONFIG_SIZE + PCI_IO_SIZE + PCI_MEM_SIZE);
if (machineid & ATARI_MILAN)
ptextra += btoc(PCI_IO_SIZE + PCI_MEM_SIZE);
ptextra += btoc(BOOTM_VA_POOL);
@@ -776,9 +776,9 @@
* Only Hades maps the PCI-config space!
*/
pci_conf_addr = ioaddr;
- ioaddr += PCI_CONF_SIZE;
+ ioaddr += PCI_CONFIG_SIZE;
pg = &pt[pci_conf_addr / PAGE_SIZE];
- epg = &pg[btoc(PCI_CONF_SIZE)];
+ epg = &pg[btoc(PCI_CONFIG_SIZE)];
mask = PCI_CONFM_PHYS;
pg_proto = PCI_CONFB_PHYS | PG_RW | PG_CI | PG_V;
for (; pg < epg; mask <<= 1)
Index: src/sys/arch/atari/include/iomap.h
diff -u src/sys/arch/atari/include/iomap.h:1.12 src/sys/arch/atari/include/iomap.h:1.13
--- src/sys/arch/atari/include/iomap.h:1.12 Wed Apr 2 07:35:55 2003
+++ src/sys/arch/atari/include/iomap.h Sun Aug 23 01:27:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: iomap.h,v 1.12 2003/04/02 07:35:55 thorpej Exp $ */
+/* $NetBSD: iomap.h,v 1.13 2009/08/23 01:27:12 mrg Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -81,9 +81,9 @@
/*
* Pre-allocated PCI-memory regions (atari_init.c). We need those in the
* boot-stages.
- * XXX: Can probably be reduced to only PCI_CONF_SIZE (Leo).
+ * XXX: Can probably be reduced to only PCI_CONFIG_SIZE (Leo).
*/
-#define PCI_CONF_SIZE (4 * PAGE_SIZE)
+#define PCI_CONFIG_SIZE (4 * PAGE_SIZE)
#define PCI_IO_SIZE (PAGE_SIZE)
#define PCI_MEM_SIZE (PAGE_SIZE)
Index: src/sys/arch/atari/isa/isa_machdep.c
diff -u src/sys/arch/atari/isa/isa_machdep.c:1.35 src/sys/arch/atari/isa/isa_machdep.c:1.36
--- src/sys/arch/atari/isa/isa_machdep.c:1.35 Wed Aug 19 15:15:21 2009
+++ src/sys/arch/atari/isa/isa_machdep.c Sun Aug 23 01:27:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.35 2009/08/19 15:15:21 dyoung Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.36 2009/08/23 01:27:13 mrg Exp $ */
/*
* Copyright (c) 1997 Leo Weppelman. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.35 2009/08/19 15:15:21 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.36 2009/08/23 01:27:13 mrg Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -155,7 +155,7 @@
}
void
-isa_detach_hook(isa_chipset_tag_t, device_t self)
+isa_detach_hook(isa_chipset_tag_t ic, device_t self)
{
}
