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

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!)
This commit is contained in:
mrg 2009-08-23 01:27:12 +00:00
parent 84ec419140
commit 5401d28313
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/arch/atari/atari/atari_init.c
View File

@ -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 @@ start_c(int id, u_int ttphystart, u_int ttphysize, u_int stphysize,
* 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 @@ map_io_areas(paddr_t ptpa, psize_t ptsize, u_int ptextra)
* 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)

6
sys/arch/atari/include/iomap.h
View File

@ -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 @@ vaddr_t pci_mem_uncached; /* KVA base of an uncached PCI mem-page */
/*
* 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)

6
sys/arch/atari/isa/isa_machdep.c
View File

@ -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 @@ isa_attach_hook(struct device *parent, struct device *self, struct isabus_attach
}
void
isa_detach_hook(isa_chipset_tag_t, device_t self)
isa_detach_hook(isa_chipset_tag_t ic, device_t self)
{
}