[src/trunk]: src/sys/arch/amiga/dev Prepare for AmigaPPC.

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

details:   https://anonhg.NetBSD.org/src/rev/3952b89181dd
branches:  trunk
changeset: 486561:3952b89181dd
user:      is <is%NetBSD.org@localhost>
date:      Thu May 25 19:10:04 2000 +0000

description:
Prepare for AmigaPPC.

diffstat:

 sys/arch/amiga/dev/grfabs_cc.c |  9 ++++++++-
 sys/arch/amiga/dev/idesc.c     |  4 +++-
 sys/arch/amiga/dev/ite.c       |  4 +++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diffs (68 lines):

diff -r 9a2467aa4642 -r 3952b89181dd sys/arch/amiga/dev/grfabs_cc.c
--- a/sys/arch/amiga/dev/grfabs_cc.c    Thu May 25 18:46:07 2000 +0000
+++ b/sys/arch/amiga/dev/grfabs_cc.c    Thu May 25 19:10:04 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grfabs_cc.c,v 1.19 1999/03/25 21:55:17 is Exp $        */
+/*     $NetBSD: grfabs_cc.c,v 1.20 2000/05/25 19:18:07 is Exp $        */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -312,6 +312,9 @@
         * n pages by less than another page, the user gets to write all over
         * the entire page.  Since you did not allocate up to a page boundry
         * (or more) the user writes into someone elses memory. -ch */
+#ifdef __powerpc__
+#define m68k_round_page(x)     ((((unsigned)(x)) + PGOFSET) & ~PGOFSET)
+#endif
        total_size = m68k_round_page(plane_size * depth) +      /* for length */
            (temp_size) + (array_size) + sizeof(bmap_t) +
            NBPG;               /* for alignment */
@@ -360,6 +363,10 @@
 {
        if (d) {
                m_this_data->current_mode = d;
+#ifdef __powerpc__     /* XXX ???? */
+               custom.cop1lc = PREP_DMA_MEM(DMDATA(d)->frames[F_LONG]);
+               custom.copjmp1 = 0;
+#endif
                return;
        }
        /* turn off display */
diff -r 9a2467aa4642 -r 3952b89181dd sys/arch/amiga/dev/idesc.c
--- a/sys/arch/amiga/dev/idesc.c        Thu May 25 18:46:07 2000 +0000
+++ b/sys/arch/amiga/dev/idesc.c        Thu May 25 19:10:04 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: idesc.c,v 1.45 2000/01/18 19:33:31 thorpej Exp $       */
+/*     $NetBSD: idesc.c,v 1.46 2000/05/25 19:11:45 is Exp $    */
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -95,7 +95,9 @@
 #include <amiga/amiga/device.h>
 #include <amiga/amiga/cia.h>
 #include <amiga/amiga/custom.h>
+#ifndef __powerpc__
 #include <amiga/amiga/isr.h>
+#endif
 #include <amiga/dev/zbusvar.h>
 
 #include <machine/cpu.h>
diff -r 9a2467aa4642 -r 3952b89181dd sys/arch/amiga/dev/ite.c
--- a/sys/arch/amiga/dev/ite.c  Thu May 25 18:46:07 2000 +0000
+++ b/sys/arch/amiga/dev/ite.c  Thu May 25 19:10:04 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ite.c,v 1.52 2000/03/23 06:33:11 thorpej Exp $ */
+/*     $NetBSD: ite.c,v 1.53 2000/05/25 19:10:04 is Exp $      */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -65,7 +65,9 @@
 #include <amiga/amiga/color.h> /* DEBUG */
 #include <amiga/amiga/custom.h>        /* DEBUG */
 #include <amiga/amiga/device.h>
+#if defined(__m68k__)
 #include <amiga/amiga/isr.h>
+#endif
 #include <amiga/dev/iteioctl.h>
 #include <amiga/dev/itevar.h>
 #include <amiga/dev/kbdmap.h>