Fix a couple of LP64 problems (long -> int32_t).

This commit is contained in:
thorpej 2000-07-12 21:15:33 +00:00
parent f56554a578
commit b2a5b02fc9
2 changed files with 10 additions and 10 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: ahb.c,v 1.29 2000/03/23 07:01:28 thorpej Exp $ */
/* $NetBSD: ahb.c,v 1.30 2000/07/12 21:15:33 thorpej Exp $ */
#include "opt_ddb.h"
@ -128,7 +128,7 @@ struct ahb_probe_data {
};
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 @@ ahb_send_mbox(sc, opcode, ecb)
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 @@ ahbintr(arg)
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);

View File

@ -1,4 +1,4 @@
/* $NetBSD: ahbreg.h,v 1.9 1998/08/17 00:26:33 mycroft Exp $ */
/* $NetBSD: ahbreg.h,v 1.10 2000/07/12 21:15:33 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 @@ struct ahb_ecb_status {
#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 @@ struct ahb_ecb {
/*-----------------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