[src/trunk]: src/sys/arch/mac68k/dev Remove the R1 syntactic sugar, since it ...

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

details:   https://anonhg.NetBSD.org/src/rev/79f637ad21e0
branches:  trunk
changeset: 783122:79f637ad21e0
user:      hauke <hauke%NetBSD.org@localhost>
date:      Thu Dec 06 13:28:17 2012 +0000

description:
Remove the R1 syntactic sugar, since it collides with a #define in
<m68k/regs.h>, breaking the build.

The R1s serve to bring the buffer pointer to a 4 byte boundary, but
that should be clear from the context.

diffstat:

 sys/arch/mac68k/dev/mac68k5380.c |  14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diffs (42 lines):

diff -r d4cca3001999 -r 79f637ad21e0 sys/arch/mac68k/dev/mac68k5380.c
--- a/sys/arch/mac68k/dev/mac68k5380.c  Thu Dec 06 12:50:09 2012 +0000
+++ b/sys/arch/mac68k/dev/mac68k5380.c  Thu Dec 06 13:28:17 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mac68k5380.c,v 1.47 2012/10/27 17:17:59 chs Exp $      */
+/*     $NetBSD: mac68k5380.c,v 1.48 2012/12/06 13:28:17 hauke Exp $    */
 
 /*
  * Copyright (c) 1995 Allen Briggs
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mac68k5380.c,v 1.47 2012/10/27 17:17:59 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mac68k5380.c,v 1.48 2012/12/06 13:28:17 hauke Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -409,9 +409,8 @@
                        data = (u_int8_t *) pending_5380_data;
                        drq = (volatile u_int8_t *) ncr_5380_with_drq;
                        while (count) {
-#define R1     *data++ = *drq++
-                               R1; count--;
-#undef R1
+                               *data++ = *drq++;
+                               count--;
                        }
                        pending_5380_data += resid;
                        pending_5380_count -= resid;
@@ -440,9 +439,8 @@
                data = (u_int8_t *) long_data;
                drq = (volatile u_int8_t *) long_drq;
                while (count) {
-#define R1     *data++ = *drq++
-                       R1; count--;
-#undef R1
+                       *data++ = *drq++;
+                       count--;
                }
                pending_5380_count -= dcount;
                pending_5380_data += dcount;