Module Name: src
Committed By: tsutsui
Date: Fri Aug 10 17:43:32 UTC 2012
Modified Files:
src/sys/arch/atari/atari: atari_init.c machdep.c
src/sys/arch/atari/include: iomap.h
Log Message:
Appease gcc -fno-common:
- remove physmem from machdep.c since it's initialized in atari_init.c
- declare I/O address space variables properly
Compile test only. (currenty my TT030 is busy on pkgsrc builds)
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/atari/atari/atari_init.c
cvs rdiff -u -r1.174 -r1.175 src/sys/arch/atari/atari/machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/atari/include/iomap.h
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.99 src/sys/arch/atari/atari/atari_init.c:1.100
--- src/sys/arch/atari/atari/atari_init.c:1.99 Tue Feb 21 12:09:50 2012
+++ src/sys/arch/atari/atari/atari_init.c Fri Aug 10 17:43:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: atari_init.c,v 1.99 2012/02/21 12:09:50 tsutsui Exp $ */
+/* $NetBSD: atari_init.c,v 1.100 2012/08/10 17:43:32 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.99 2012/02/21 12:09:50 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.100 2012/08/10 17:43:32 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_mbtype.h"
@@ -141,6 +141,13 @@ vaddr_t page_zero;
u_long st_pool_size = ST_POOL_SIZE * PAGE_SIZE; /* Patchable */
u_long st_pool_virt, st_pool_phys;
+/* I/O address space variables */
+vaddr_t stio_addr; /* Where the st io-area is mapped */
+vaddr_t pci_conf_addr; /* KVA base of PCI config space */
+vaddr_t pci_io_addr; /* KVA base of PCI io-space */
+vaddr_t pci_mem_addr; /* KVA base of PCI mem-space */
+vaddr_t pci_mem_uncached; /* KVA base of an uncached PCI mem-page */
+
/*
* Are we relocating the kernel to TT-Ram if possible? It is faster, but
* it is also reported not to work on all TT's. So the default is NO.
Index: src/sys/arch/atari/atari/machdep.c
diff -u src/sys/arch/atari/atari/machdep.c:1.174 src/sys/arch/atari/atari/machdep.c:1.175
--- src/sys/arch/atari/atari/machdep.c:1.174 Fri Jul 27 05:36:10 2012
+++ src/sys/arch/atari/atari/machdep.c Fri Aug 10 17:43:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.174 2012/07/27 05:36:10 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.175 2012/08/10 17:43:32 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.174 2012/07/27 05:36:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.175 2012/08/10 17:43:32 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -112,7 +112,6 @@ struct vm_map *phys_map = NULL;
void * msgbufaddr;
vaddr_t msgbufpa;
-int physmem = MAXMEM; /* max supported memory, changes to actual */
extern int freebufspace;
extern u_int lowram;
Index: src/sys/arch/atari/include/iomap.h
diff -u src/sys/arch/atari/include/iomap.h:1.14 src/sys/arch/atari/include/iomap.h:1.15
--- src/sys/arch/atari/include/iomap.h:1.14 Tue Oct 20 19:10:11 2009
+++ src/sys/arch/atari/include/iomap.h Fri Aug 10 17:43:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iomap.h,v 1.14 2009/10/20 19:10:11 snj Exp $ */
+/* $NetBSD: iomap.h,v 1.15 2012/08/10 17:43:32 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -36,7 +36,7 @@
* I/O Address maps
*/
#ifdef _KERNEL
-vaddr_t stio_addr; /* Where the st io-area is mapped */
+extern vaddr_t stio_addr; /* Where the st io-area is mapped */
#define AD_STIO (stio_addr) /* .. see atari_init.c */
/*
@@ -48,10 +48,10 @@ vaddr_t stio_addr; /* Where the st io-a
* with the PLX. Also, the Milan uses the first page of 'pci_io_addr' for
* access to some of it's ISA I/O devices (RTC, Interrupt controller, etc.)
*/
-vaddr_t pci_conf_addr; /* KVA base of PCI config space */
-vaddr_t pci_io_addr; /* KVA base of PCI io-space */
-vaddr_t pci_mem_addr; /* KVA base of PCI mem-space */
-vaddr_t pci_mem_uncached; /* KVA base of an uncached PCI mem-page */
+extern vaddr_t pci_conf_addr; /* KVA base of PCI config space */
+extern vaddr_t pci_io_addr; /* KVA base of PCI io-space */
+extern vaddr_t pci_mem_addr; /* KVA base of PCI mem-space */
+extern vaddr_t pci_mem_uncached; /* KVA base of an uncached PCI mem-page */
#endif /* _KERNEL */
#define PCI_CONFB_PHYS (0xA0000000L)
