[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/07eab6b201e3
branches:  trunk
changeset: 783136:07eab6b201e3
user:      hauke <hauke%NetBSD.org@localhost>
date:      Fri Dec 07 08:04:02 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/sbc.c |  20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

diffs (69 lines):

diff -r 20c2b08258ec -r 07eab6b201e3 sys/arch/mac68k/dev/sbc.c
--- a/sys/arch/mac68k/dev/sbc.c Fri Dec 07 07:06:39 2012 +0000
+++ b/sys/arch/mac68k/dev/sbc.c Fri Dec 07 08:04:02 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sbc.c,v 1.54 2009/11/23 00:11:44 rmind Exp $   */
+/*     $NetBSD: sbc.c,v 1.55 2012/12/07 08:04:02 hauke Exp $   */
 
 /*
  * Copyright (C) 1996 Scott Reynolds.  All rights reserved.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbc.c,v 1.54 2009/11/23 00:11:44 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbc.c,v 1.55 2012/12/07 08:04:02 hauke Exp $");
 
 #include "opt_ddb.h"
 
@@ -274,7 +274,6 @@
        }
 
 #define R4     *(u_int32_t *)data = *long_data, data += 4;
-#define R1     *(u_int8_t *)data = *byte_data, data += 1;
        for (; resid >= 128; resid -= 128) {
                if (sbc_ready(ncr_sc))
                        goto interrupt;
@@ -286,11 +285,10 @@
        while (resid) {
                if (sbc_ready(ncr_sc))
                        goto interrupt;
-               R1;
+               *(u_int8_t *)data = *byte_data, data += 1;
                resid--;
        }
 #undef R4
-#undef R1
 
 interrupt:
        nofault = NULL;
@@ -546,12 +544,10 @@
                if (count && count < 4) {
                        data = (u_int8_t *)dh->dh_addr;
                        drq = (volatile u_int8_t *)sc->sc_drq_addr;
-
-#define R1             *data++ = *drq++
                        while (count) {
-                               R1; count--;
+                               *data++ = *drq++;
+                               count--;
                        }
-#undef R1
                        dh->dh_addr += resid;
                        dh->dh_len -= resid;
                }
@@ -576,12 +572,10 @@
 #undef R4
                        data = (u_int8_t *)long_data;
                        drq = (volatile u_int8_t *)long_drq;
-
-#define R1             *data++ = *drq++
                        while (count) {
-                               R1; count--;
+                               *data++ = *drq++;
+                               count--;
                        }
-#undef R1
                        dh->dh_len -= dcount;
                        dh->dh_addr += dcount;
                }