[src/trunk]: src/sys/arch/amigappc Bring some stuff up-to-date. To be continued.

[is <is%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/961b8c5797aa
branches:  trunk
changeset: 552588:961b8c5797aa
user:      is <is%NetBSD.org@localhost>
date:      Sat Sep 27 21:32:12 2003 +0000

description:
Bring some stuff up-to-date. To be continued.

diffstat:

 sys/arch/amigappc/conf/Makefile.amigappc |  22 +++++++++++-----------
 sys/arch/amigappc/conf/files.amigappc    |  12 +++++++++---
 sys/arch/amigappc/include/cpu.h          |  12 +-----------
 sys/arch/amigappc/include/param.h        |  17 +----------------
 4 files changed, 22 insertions(+), 41 deletions(-)

diffs (130 lines):

diff -r 64eff6752ac2 -r 961b8c5797aa sys/arch/amigappc/conf/Makefile.amigappc
--- a/sys/arch/amigappc/conf/Makefile.amigappc  Sat Sep 27 21:29:37 2003 +0000
+++ b/sys/arch/amigappc/conf/Makefile.amigappc  Sat Sep 27 21:32:12 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.amigappc,v 1.9 2003/01/06 13:04:59 wiz Exp $
+#      $NetBSD: Makefile.amigappc,v 1.10 2003/09/27 21:32:12 is Exp $
 
 # Makefile for NetBSD
 #
@@ -18,19 +18,19 @@
 #      makeoptions DEBUGLIST="uvm* trap if_*"
 
 MACHINE_ARCH=powerpc
-USETOOLS?=     no
+USETOOLS?=     yes
 NEED_OWN_INSTALL_TARGET?=no
 .include <bsd.own.mk>
 
-AR?=           /usr/pkg/cross/powerpc-netbsd/bin/ar
-AS?=           /usr/pkg/cross/powerpc-netbsd/bin/as
-CC?=           /usr/pkg/cross/powerpc-netbsd/bin/cc
-CPP?=          /usr/pkg/cross/lib/gcc-lib/powerpc-netbsd/egcs-2.91.60/cpp
-LD?=           /usr/pkg/cross/powerpc-netbsd/bin/ld
-NM?=           /usr/pkg/cross/powerpc-netbsd/bin/nm
-RANLIB?=       /usr/pkg/cross/powerpc-netbsd/bin/ranlib
-SIZE?=         /usr/pkg/cross/powerpc-netbsd/bin/size
-STRIP?=                /usr/pkg/cross/powerpc-netbsd/bin/strip
+AR?=           ar
+AS?=           as
+CC?=           cc
+CPP?=          cpp
+LD?=           ld
+NM?=           nm
+RANLIB?=       ranlib
+SIZE?=         size
+STRIP?=                strip
 
 ##
 ## (1) port identification
diff -r 64eff6752ac2 -r 961b8c5797aa sys/arch/amigappc/conf/files.amigappc
--- a/sys/arch/amigappc/conf/files.amigappc     Sat Sep 27 21:29:37 2003 +0000
+++ b/sys/arch/amigappc/conf/files.amigappc     Sat Sep 27 21:32:12 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.amigappc,v 1.15 2003/09/27 20:52:59 is Exp $
+#      $NetBSD: files.amigappc,v 1.16 2003/09/27 21:32:12 is Exp $
 
 # maxpartitions must be first item in files.${ARCH}.newconf
 maxpartitions 16                       # NOTE THAT AMIGA IS SPECIAL!
@@ -103,9 +103,15 @@
 attach ite at grf
 file   arch/amiga/dev/ite.c            ite needs-flag
 file   arch/amiga/dev/kbdmap.c         ite
-file   arch/amiga/dev/kf_8x8.c         ite | amidisplaycc
-file   arch/amiga/dev/kf_8x11.c        kfont_8x11
 file   arch/amiga/dev/kf_custom.c      kfont_custom
+file   arch/amiga/dev/kf_iso8859_1_8x8.c       kfont_cons_iso8859_1 &
+       ( ite | amidisplaycc )
+file   arch/amiga/dev/kf_iso8859_1_8x11.c      kfont_cons_iso8859_1 &
+       kfont_8x11
+file   arch/amiga/dev/kf_iso8859_2_8x8.c       kfont_cons_iso8859_2 &
+       ( ite | amidisplaycc )
+file   arch/amiga/dev/kf_iso8859_2_8x11.c      kfont_cons_iso8859_2 &
+       kfont_8x11
 
 # custom chips grf (ite0 grf0)
 device grfcc: grfbus
diff -r 64eff6752ac2 -r 961b8c5797aa sys/arch/amigappc/include/cpu.h
--- a/sys/arch/amigappc/include/cpu.h   Sat Sep 27 21:29:37 2003 +0000
+++ b/sys/arch/amigappc/include/cpu.h   Sat Sep 27 21:32:12 2003 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: cpu.h,v 1.8 2001/12/03 21:15:15 aymeric Exp $ */
+/*      $NetBSD: cpu.h,v 1.9 2003/09/27 21:32:12 is Exp $ */
 
 /*
  * Copyright (C) 1995-1997 Wolfgang Solfrank.
@@ -44,9 +44,6 @@
 #include <sys/sched.h>
 
 #ifdef _KERNEL
-extern struct cpu_info cpu_info_store;
-
-#define        curcpu()                        (&cpu_info_store)
 
 u_long clkread __P((void));
 void   physaccess      __P((caddr_t, caddr_t, int, int));
@@ -70,13 +67,6 @@
 extern void delay __P((unsigned));
 #define DELAY(n)                delay(n)
 
-extern __volatile int want_resched;
-extern __volatile int astpending;
-
-#define need_resched(ci)          (want_resched = 1, astpending = 1)
-#define need_proftick(p)        ((p)->p_flag |= P_OWEUPC, astpending = 1)
-#define signotify(p)            (astpending = 1)
-
 extern char bootpath[];
 
 #if defined(_KERNEL) || defined(_STANDALONE)
diff -r 64eff6752ac2 -r 961b8c5797aa sys/arch/amigappc/include/param.h
--- a/sys/arch/amigappc/include/param.h Sat Sep 27 21:29:37 2003 +0000
+++ b/sys/arch/amigappc/include/param.h Sat Sep 27 21:32:12 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.7 2003/08/07 16:26:47 agc Exp $    */
+/*     $NetBSD: param.h,v 1.8 2003/09/27 21:32:12 is Exp $     */
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -163,21 +163,6 @@
 #define        btodb(x)        ((x) >> DEV_BSHIFT)
 
 /*
- * Segment handling stuff
- */
-#define        SEGMENT_LENGTH  0x10000000
-#define        SEGMENT_MASK    0xf0000000
-
-/*
- * Fixed segments
- */
-#define        USER_SR         13
-#define        KERNEL_SR       14
-#define        KERNEL_SEGMENT  (0xf0000 + KERNEL_SR)
-#define        EMPTY_SEGMENT   0xfffff0
-#define        USER_ADDR       ((void *)(USER_SR << ADDR_SR_SHFT))
-
-/*
  * Some system constants
  */
 #ifndef        NPMAPS