[src/netbsd-1-5]: src/sys/dev/eisa Update from trunk:

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

details:   https://anonhg.NetBSD.org/src/rev/181d6635c426
branches:  netbsd-1-5
changeset: 488471:181d6635c426
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Jul 12 21:16:47 2000 +0000

description:
Update from trunk:
Fix a couple of LP64 problems (long -> int32_t).

diffstat:

 sys/dev/eisa/ahb.c    |   8 ++++----
 sys/dev/eisa/ahbreg.h |  12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (76 lines):

diff -r 60ee4eaf3a2f -r 181d6635c426 sys/dev/eisa/ahb.c
--- a/sys/dev/eisa/ahb.c        Wed Jul 12 21:04:17 2000 +0000
+++ b/sys/dev/eisa/ahb.c        Wed Jul 12 21:16:47 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ahb.c,v 1.29 2000/03/23 07:01:28 thorpej Exp $ */
+/*     $NetBSD: ahb.c,v 1.29.4.1 2000/07/12 21:16:47 thorpej Exp $     */
 
 #include "opt_ddb.h"
 
@@ -128,7 +128,7 @@
 };
 
 void   ahb_send_mbox __P((struct ahb_softc *, int, struct ahb_ecb *));
-void   ahb_send_immed __P((struct ahb_softc *, u_long, struct ahb_ecb *));
+void   ahb_send_immed __P((struct ahb_softc *, u_int32_t, struct ahb_ecb *));
 int    ahbintr __P((void *));
 void   ahb_free_ecb __P((struct ahb_softc *, struct ahb_ecb *));
 struct ahb_ecb *ahb_get_ecb __P((struct ahb_softc *, int));
@@ -334,7 +334,7 @@
 void
 ahb_send_immed(sc, cmd, ecb)
        struct ahb_softc *sc;
-       u_long cmd;
+       u_int32_t cmd;
        struct ahb_ecb *ecb;
 {
        bus_space_tag_t iot = sc->sc_iot;
@@ -374,7 +374,7 @@
        bus_space_handle_t ioh = sc->sc_ioh;
        struct ahb_ecb *ecb;
        u_char ahbstat;
-       u_long mboxval;
+       u_int32_t mboxval;
 
 #ifdef AHBDEBUG
        printf("%s: ahbintr ", sc->sc_dev.dv_xname);
diff -r 60ee4eaf3a2f -r 181d6635c426 sys/dev/eisa/ahbreg.h
--- a/sys/dev/eisa/ahbreg.h     Wed Jul 12 21:04:17 2000 +0000
+++ b/sys/dev/eisa/ahbreg.h     Wed Jul 12 21:16:47 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ahbreg.h,v 1.9 1998/08/17 00:26:33 mycroft Exp $       */
+/*     $NetBSD: ahbreg.h,v 1.9.22.1 2000/07/12 21:16:48 thorpej Exp $  */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -52,8 +52,8 @@
  * functioning of this software in any circumstances.
  */
 
-typedef u_long physaddr;
-typedef u_long physlen;
+typedef u_int32_t physaddr;
+typedef u_int32_t physlen;
 
 /*
  * Offset of AHA1740 registers, relative from slot base.
@@ -167,8 +167,8 @@
 #define        HS_SCSI_RESET_ADAPTER   0x22
 #define        HS_SCSI_RESET_INCOMING  0x23
        u_char  target_stat;
-       u_long  resid_count;
-       u_long  resid_addr;
+       u_int32_t  resid_count;
+       u_int32_t  resid_addr;
        u_short addit_status;
        u_char  sense_len;
        u_char  unused[9];
@@ -218,7 +218,7 @@
        /*-----------------end of hardware supported fields----------------*/
        TAILQ_ENTRY(ahb_ecb) chain;
        struct ahb_ecb *nexthash;
-       long hashkey;
+       int32_t hashkey;
        struct scsipi_xfer *xs; /* the scsipi_xfer for this cmd */
        int flags;
 #define        ECB_ALLOC       0x01