Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mac68k/dev - Don't use multi-line string literals.



details:   https://anonhg.NetBSD.org/src/rev/2e8462a86bef
branches:  trunk
changeset: 532037:2e8462a86bef
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu May 30 21:26:13 2002 +0000

description:
- Don't use multi-line string literals.
- Statements must follow labels.

diffstat:

 sys/arch/mac68k/dev/adb_direct.c |  35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 deletions(-)

diffs (77 lines):

diff -r fbd334c7ca49 -r 2e8462a86bef sys/arch/mac68k/dev/adb_direct.c
--- a/sys/arch/mac68k/dev/adb_direct.c  Thu May 30 21:20:41 2002 +0000
+++ b/sys/arch/mac68k/dev/adb_direct.c  Thu May 30 21:26:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: adb_direct.c,v 1.46 2002/03/05 17:39:25 shiba Exp $    */
+/*     $NetBSD: adb_direct.c,v 1.47 2002/05/30 21:26:13 thorpej Exp $  */
 
 /* From: adb_direct.c 2.02 4/18/97 jpw */
 
@@ -597,6 +597,7 @@
                if (adb_debug)
                        printf_intr("intr: unknown ADB state\n");
 #endif
+               break;
        }
 
        ADB_VIA_INTR_ENABLE();  /* enable ADB interrupt on IIs. */
@@ -1040,6 +1041,7 @@
                if (adb_debug)
                        printf_intr("adb: unknown ADB state (during intr)\n");
 #endif
+               break;
        }
 
        ADB_VIA_INTR_ENABLE();  /* enable ADB interrupt on IIs. */
@@ -1412,6 +1414,7 @@
                if (adb_debug)
                        printf_intr("intr: unknown ADB state\n");
 #endif
+               break;
        }
 
        ADB_VIA_INTR_ENABLE();  /* enable ADB interrupt on IIs. */
@@ -1782,13 +1785,14 @@
                /* call default completion routine if it's valid */
                if (comprout) {
 #ifdef __NetBSD__
-                       asm("   movml #0xffff,%%sp@-    | save all registers
-                               movl %0,%%a2            | compdata
-                               movl %1,%%a1            | comprout
-                               movl %2,%%a0            | buffer
-                               movl %3,%%d0            | cmd
-                               jbsr %%a1@              | go call the routine
-                               movml %%sp@+,#0xffff    | restore all registers"
+                       __asm __volatile (
+                       "       movml #0xffff,%%sp@- \n" /* save all regs */
+                       "       movl %0,%%a2    \n"     /* compdata */
+                       "       movl %1,%%a1    \n"     /* comprout */
+                       "       movl %2,%%a0    \n"     /* buffer */
+                       "       movl %3,%%d0    \n"     /* cmd */
+                       "       jbsr %%a1@      \n"     /* go call routine */
+                       "       movml %%sp@+,#0xffff"   /* restore all regs */
                            :
                            : "g"(compdata), "g"(comprout),
                                "g"(buffer), "g"(cmd)
@@ -2355,13 +2359,14 @@
 {
        if ((long)0 != adbCompRout) /* don't call if empty return location */
 #ifdef __NetBSD__
-               asm("   movml #0xffff,%%sp@-    | save all registers
-                       movl %0,%%a2            | adbCompData
-                       movl %1,%%a1            | adbCompRout
-                       movl %2,%%a0            | adbBuffer
-                       movl %3,%%d0            | adbWaitingCmd
-                       jbsr %%a1@              | go call the routine
-                       movml %%sp@+,#0xffff    | restore all registers"
+               __asm __volatile(
+               "       movml #0xffff,%%sp@- \n" /* save all registers */
+               "       movl %0,%%a2 \n"        /* adbCompData */
+               "       movl %1,%%a1 \n"        /* adbCompRout */
+               "       movl %2,%%a0 \n"        /* adbBuffer */
+               "       movl %3,%%d0 \n"        /* adbWaitingCmd */
+               "       jbsr %%a1@ \n"          /* go call the routine */
+               "       movml %%sp@+,#0xffff"   /* restore all registers */
                    :
                    : "g"(adbCompData), "g"(adbCompRout),
                        "g"(adbBuffer), "g"(adbWaitingCmd)



Home | Main Index | Thread Index | Old Index