Thu Jan 20 15:44:56 2011 UTC ()
Add missing is_a600() definition, used by amiga devices.
We simply define it as 0, because an A600 will never have a PPC installed.


(phx)
diff -r1.18 -r1.19 src/sys/arch/amigappc/include/cpu.h
cvs diff -r1.18 -r1.19 src/sys/arch/amigappc/include/cpu.h (expand / switch to unified diff)

--- src/sys/arch/amigappc/include/cpu.h 2010/02/09 18:13:10 1.18
+++ src/sys/arch/amigappc/include/cpu.h 2011/01/20 15:44:56 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: cpu.h,v 1.18 2010/02/09 18:13:10 phx Exp $ */ 1/* $NetBSD: cpu.h,v 1.19 2011/01/20 15:44:56 phx Exp $ */
2 2
3/* 3/*
4 * Copyright (C) 1995-1997 Wolfgang Solfrank. 4 * Copyright (C) 1995-1997 Wolfgang Solfrank.
5 * Copyright (C) 1995-1997 TooLs GmbH. 5 * Copyright (C) 1995-1997 TooLs GmbH.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -37,34 +37,35 @@ @@ -37,34 +37,35 @@
37#define CPU_MAXNUM 1 37#define CPU_MAXNUM 1
38 38
39/* 39/*
40 * Amiga models 40 * Amiga models
41 */ 41 */
42#define A1200 1200 42#define A1200 1200
43#define A3000 3000 43#define A3000 3000
44#define A4000 4000 44#define A4000 4000
45extern int machineid; 45extern int machineid;
46 46
47/* 47/*
48 * Prototypes from amiga_init.c 48 * Prototypes from amiga_init.c
49 */ 49 */
50void *alloc_z2mem (long); 50void *alloc_z2mem(long);
51 51
52/* 52/*
53 * Prototypes from autoconf.c 53 * Prototypes from autoconf.c
54 */ 54 */
55int is_a1200 (void); 55#define is_a600() 0
56int is_a3000 (void); 56int is_a1200(void);
57int is_a4000 (void); 57int is_a3000(void);
 58int is_a4000(void);
58 59
59/* 60/*
60 * Prototypes from machdep.c 61 * Prototypes from machdep.c
61 */ 62 */
62int dma_cachectl(void *, int); 63int dma_cachectl(void *, int);
63 64
64/* 65/*
65 * Prototypes from powerpc/powerpc/trap.c 66 * Prototypes from powerpc/powerpc/trap.c
66 */ 67 */
67int badaddr_read(void *, size_t, int *); 68int badaddr_read(void *, size_t, int *);
68 69
69#endif /* _KERNEL */ 70#endif /* _KERNEL */
70 71