[src/trunk]: src/sys Use mips instead of mips.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys Use __mips__ instead of mips.
From: thorpej <thorpej%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 11:31:47 +0000
details:   https://anonhg.NetBSD.org/src/rev/e63d5fbe63e7
branches:  trunk
changeset: 532138:e63d5fbe63e7
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri May 31 21:43:49 2002 +0000

description:
Use __mips__ instead of mips.

diffstat:

 sys/arch/newsmips/dev/screg_1185.h  |   6 +++---
 sys/arch/newsmips/dev/scsi_1185.c   |  36 ++++++++++++++++++------------------
 sys/arch/newsmips/dev/scsireg.h     |   4 ++--
 sys/arch/newsmips/newsmips/machid.h |   8 ++++----
 sys/dev/i2o/dpti.c                  |   6 +++---
 5 files changed, 30 insertions(+), 30 deletions(-)

diffs (253 lines):

diff -r e41952622a17 -r e63d5fbe63e7 sys/arch/newsmips/dev/screg_1185.h
--- a/sys/arch/newsmips/dev/screg_1185.h        Fri May 31 21:40:49 2002 +0000
+++ b/sys/arch/newsmips/dev/screg_1185.h        Fri May 31 21:43:49 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: screg_1185.h,v 1.2 1999/02/15 04:36:34 hubertf Exp $   */
+/*     $NetBSD: screg_1185.h,v 1.3 2002/05/31 21:45:01 thorpej Exp $   */
 /*
  * Copyright (c) 1992, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -51,14 +51,14 @@
 /*
  *             SCSI I/F Chip CXD1185Q Register address assignment
  */
-#ifdef mips
+#ifdef __mips__
 # define       SCSI_BASE       0xbfe00100
 #else
 # define       SCSI_BASE       0xe1900000
 #endif
 
 #ifndef U_CHAR
-#ifdef mips
+#ifdef __mips__
 #define U_CHAR volatile u_char
 #else
 #define U_CHAR u_char
diff -r e41952622a17 -r e63d5fbe63e7 sys/arch/newsmips/dev/scsi_1185.c
--- a/sys/arch/newsmips/dev/scsi_1185.c Fri May 31 21:40:49 2002 +0000
+++ b/sys/arch/newsmips/dev/scsi_1185.c Fri May 31 21:43:49 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsi_1185.c,v 1.8 2001/11/14 18:15:30 thorpej Exp $    */
+/*     $NetBSD: scsi_1185.c,v 1.9 2002/05/31 21:43:49 thorpej Exp $    */
 
 /*
  * Copyright (c) 1992, 1993
@@ -109,7 +109,7 @@
 
 #define        splscsi splsc
 
-#if defined(mips) && defined(CPU_SINGLE)
+#if defined(__mips__) && defined(CPU_SINGLE)
 #define nops(x)                { int i; for (i = 0; i < (x); i++) ; }
 #define        DMAC_WAIT0      ;
 #else
@@ -166,7 +166,7 @@
 extern void sc_done __P((struct sc_scb *));
 extern paddr_t kvtophys __P((vaddr_t));
 
-#if defined(mips) && defined(CPU_SINGLE)
+#if defined(__mips__) && defined(CPU_SINGLE)
 #define dma_reset(x) {                                         \
        int s = splscsi();                                      \
        dmac_gsel = (x); dmac_cctl = DM_RST; dmac_cctl = 0;     \
@@ -683,7 +683,7 @@
        if (dmac_map_init == 0) {
                dmac_map_init++;
                for (i = 0; i < NDMACMAP; i++) {
-# if defined(mips) && defined(CPU_SINGLE)
+# if defined(__mips__) && defined(CPU_SINGLE)
                        dmac_gsel = CH_SCSI;
                        dmac_ctag = (u_char)i;
                        dmac_cmap = (u_short)0;
@@ -713,7 +713,7 @@
 
        s = splscsi();
 
-#if defined(mips) && defined(CPU_SINGLE)
+#if defined(__mips__) && defined(CPU_SINGLE)
        dmac_gsel = CH_SCSI;
        dmac_cwid = 4;                          /* initialize DMAC SCSI chan */
        *(unsigned VOLATILE char *)PINTEN |= DMA_INTEN;
@@ -795,7 +795,7 @@
                        if ((cs->scb->istatus & INST_EP) == 0)
                                cs->scb->istatus = (INST_EP|INST_HE);
                        cs->scb = NULL;
-#ifdef mips
+#ifdef __mips__
                        clean_k2dcache(scb);
 #endif
                        if (cs->intr_flg == SCSI_INTEN) {
@@ -962,7 +962,7 @@
                if (sc->perr_flag[cs->chan_num] > 0)
                        cs->scb->istatus |= INST_EP|INST_PRE;
                cs->scb = NULL;
-#ifdef mips
+#ifdef __mips__
                clean_k2dcache(scb);
 #endif
                if (cs->intr_flg == SCSI_INTEN) {
@@ -998,7 +998,7 @@
        if (cs == NULL)
                return;
 
-#if defined(mips) && defined(CPU_SINGLE)
+#if defined(__mips__) && defined(CPU_SINGLE)
        dma_reset(CH_SCSI);
 #endif
        phase = sc_cmonr & SC_PMASK;
@@ -1552,11 +1552,11 @@
                }
        }
 
-#if defined(mips) && defined(CPU_SINGLE)
+#if defined(__mips__) && defined(CPU_SINGLE)
        SET_CMD(sc, SCMD_TR_INFO|R0_DMA|R0_TRBE);
 #endif
 
-#if defined(mips) && defined(CPU_SINGLE)
+#if defined(__mips__) && defined(CPU_SINGLE)
        dmac_gsel = CH_SCSI;
        dmac_ctrcl = (u_char)(cs->act_trcnt & 0xff);
        dmac_ctrcm = (u_char)((cs->act_trcnt >> 8) & 0xff);
@@ -1574,14 +1574,14 @@
                for (i = cs->act_tag; i < pages; i++) {
                        if ((pfn = scb->sc_map->mp_addr[i]) == 0)
                                panic("SCSI:sc_dma() zero entry");
-#if defined(mips) && defined(CPU_SINGLE)
+#if defined(__mips__) && defined(CPU_SINGLE)
                        dmac_gsel = CH_SCSI;
                        dmac_ctag = (u_char)tag++;
                        dmac_cmap = (u_short)pfn;
 #endif
                }
 #ifdef MAP_OVER_ACCESS
-# if defined(mips) && defined(CPU_SINGLE)
+# if defined(__mips__) && defined(CPU_SINGLE)
                dmac_gsel = CH_SCSI;
                dmac_ctag = (u_char)tag++;
                dmac_cmap = (u_short)pfn;
@@ -1594,7 +1594,7 @@
                pfn = kvtophys((vaddr_t)cs->act_point) >> PGSHIFT;
                pages = (cs->act_trcnt >> PGSHIFT) + 2;
                for (i = 0; i < pages; i++) {
-#if defined(mips) && defined(CPU_SINGLE)
+#if defined(__mips__) && defined(CPU_SINGLE)
                        dmac_gsel = CH_SCSI;
                        dmac_ctag = (u_char)tag++;
                        dmac_cmap = (u_short)pfn + i;
@@ -1602,14 +1602,14 @@
                }
        }
 
-#if defined(mips) && defined(CPU_SINGLE)
+#if defined(__mips__) && defined(CPU_SINGLE)
        dmac_gsel = CH_SCSI;
        dmac_ctag = 0;
 #endif
 
        if (phase == DAT_IN) {
                sc->dma_stat = SC_DMAC_RD;
-#if defined(mips) && defined(CPU_SINGLE)
+#if defined(__mips__) && defined(CPU_SINGLE)
                /*
                 * auto pad flag is always on
                 */
@@ -1622,7 +1622,7 @@
        }
        else if (phase == DAT_OUT) {
                sc->dma_stat = SC_DMAC_WR;
-#if defined(mips) && defined(CPU_SINGLE)
+#if defined(__mips__) && defined(CPU_SINGLE)
                dmac_gsel = CH_SCSI;
                dmac_cctl = DM_APAD;
                DMAC_WAIT;
@@ -1753,7 +1753,7 @@
                sc->pad_start = 0;
                remain_cnt = 0;
        } else {
-# if defined(mips) && defined(CPU_SINGLE)
+# if defined(__mips__) && defined(CPU_SINGLE)
                remain_cnt = GET_CNT();
                remain_cnt -= sc->pad_cnt[cs->chan_num];
                if (sc->dma_stat == SC_DMAC_WR) {
@@ -1775,7 +1775,7 @@
                cs->act_point += sent_byte;
 }
 
-#ifdef mips
+#ifdef __mips__
 static void
 clean_k2dcache(scb)
        struct sc_scb *scb;
diff -r e41952622a17 -r e63d5fbe63e7 sys/arch/newsmips/dev/scsireg.h
--- a/sys/arch/newsmips/dev/scsireg.h   Fri May 31 21:40:49 2002 +0000
+++ b/sys/arch/newsmips/dev/scsireg.h   Fri May 31 21:43:49 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsireg.h,v 1.6 2001/04/26 15:52:01 tsubai Exp $       */
+/*     $NetBSD: scsireg.h,v 1.7 2002/05/31 21:45:01 thorpej Exp $      */
 
 /*
  * Copyright (c) 1992, 1993
@@ -162,7 +162,7 @@
 
 
 #ifdef CPU_DOUBLE
-# ifdef mips
+# ifdef __mips__
 #  define      ipc_phys(x)     (caddr_t)K0_TT0(x)
 # else
 #  define      ipc_phys(x)     (caddr_t)((int)(x) & ~0x80000000)
diff -r e41952622a17 -r e63d5fbe63e7 sys/arch/newsmips/newsmips/machid.h
--- a/sys/arch/newsmips/newsmips/machid.h       Fri May 31 21:40:49 2002 +0000
+++ b/sys/arch/newsmips/newsmips/machid.h       Fri May 31 21:43:49 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machid.h,v 1.3 1999/12/22 05:55:26 tsubai Exp $        */
+/*     $NetBSD: machid.h,v 1.4 2002/05/31 21:50:18 thorpej Exp $       */
 /*
  * Copyright (c) 1992, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -90,13 +90,13 @@
 #define        NWB235A 236
 #define        NWXRES  255
 
-#ifdef mips
+#ifdef __mips__
 #define        MACHID_MODEL(X)         (((X)>>18)&0x1f)
 #define        MACHID_SERIAL(X)        ((X)&0x3ffff)
-#else /* mips */
+#else /* __mips__ */
 #define        MACHID_MODEL(X)         (((X)>>16)&0xff)
 #define        MACHID_SERIAL(X)        ((X)&0xffff)
-#endif /* mips */
+#endif /* __mips__ */
 
 #ifndef LOCORE
 
diff -r e41952622a17 -r e63d5fbe63e7 sys/dev/i2o/dpti.c
--- a/sys/dev/i2o/dpti.c        Fri May 31 21:40:49 2002 +0000
+++ b/sys/dev/i2o/dpti.c        Fri May 31 21:43:49 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dpti.c,v 1.3 2001/11/13 12:24:58 lukem Exp $   */
+/*     $NetBSD: dpti.c,v 1.4 2002/05/31 21:49:51 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.3 2001/11/13 12:24:58 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.4 2002/05/31 21:49:51 thorpej Exp $");
 
 #include "opt_i2o.h"
 
@@ -107,7 +107,7 @@
        PROC_POWERPC,
 #elif defined(alpha)
        PROC_ALPHA,
-#elif defined(mips)
+#elif defined(__mips__)
        PROC_MIPS,
 #elif defined(sparc64)
        PROC_ULTRASPARC,
Prev by Date: [src/trunk]: src/usr.sbin/user Sort SEE ALSO.
Next by Date: [src/trunk]: src/sys/arch/newsmips/dev Statements must follow labels.
Previous by Thread: [src/trunk]: src/usr.sbin/user Sort SEE ALSO.
Next by Thread: [src/trunk]: src/sys/arch/newsmips/dev Statements must follow labels.
Indexes:
Home | Main Index | Thread Index | Old Index
[src/trunk]: src/sys Use __mips__ instead of mips.

[src/trunk]: src/sys Use mips instead of mips.
