d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanse the SCSI subsystem of its internally defined types

Browse Source 
u_int32, u_int16, u_int8, int32, int16, int8.
	Use the system defined *_t types instead.
This commit is contained in:
Justin T. Gibbs 1996-03-10 07:04:48 +00:00
parent e4f25ddc16
commit 58a8ca6a4d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=14451
7 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/isa/isa.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* $Id: isa.c,v 1.63 1996/01/27 02:33:36 bde Exp $
* $Id: isa.c,v 1.64 1996/03/10 02:10:27 jkh Exp $
*/
/*
@ -270,8 +270,6 @@ isa_configure() {
dev_attach(&kdc_isa0);
splhigh();
enable_intr();
INTREN(IRQ_SLAVE);
printf("Probing for devices on the ISA bus:\n");
/* First probe all the sensitive probes */
for (dvp = isa_devtab_tty; dvp->id_driver; dvp++)

10
sys/i386/isa/aha1542.c
View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: aha1542.c,v 1.54 1995/12/29 00:30:06 peter Exp $
* $Id: aha1542.c,v 1.55 1996/01/07 19:22:33 gibbs Exp $
*/
/*
@ -323,7 +323,7 @@ static struct aha_data {
struct scsi_link sc_link; /* prototype for subdevs */
} *ahadata[NAHA];
static u_int32 aha_adapter_info __P((int unit));
static u_int32_t aha_adapter_info __P((int unit));
static int ahaattach __P((struct isa_device *dev));
static int aha_bus_speed_check __P((struct aha_data *aha, int speed));
#ifdef notyet
@ -344,7 +344,7 @@ static int aha_poll __P((struct aha_data *aha, struct scsi_xfer *xs,
struct aha_ccb *ccb));
static int ahaprobe __P((struct isa_device *dev));
static void aha_registerdev __P((struct isa_device *id));
static int32 aha_scsi_cmd __P((struct scsi_xfer *xs));
static int32_t aha_scsi_cmd __P((struct scsi_xfer *xs));
static int aha_set_bus_speed __P((struct aha_data *aha));
static timeout_t
aha_timeout;
@ -681,7 +681,7 @@ ahaattach(dev)
* Return some information to the caller about the adapter and its
* capabilities.
*/
static u_int32
static u_int32_t
aha_adapter_info(unit)
int unit;
{
@ -1386,7 +1386,7 @@ static int physcontig(int kv, int len)
* the data address. Also needs the unit, target
* and lu
*/
static int32
static int32_t
aha_scsi_cmd(xs)
struct scsi_xfer *xs;
{

10
sys/i386/isa/aic6360.c
View File

@ -31,7 +31,7 @@
*/
/*
* $Id: aic6360.c,v 1.18 1996/01/04 21:11:21 wollman Exp $
* $Id: aic6360.c,v 1.19 1996/01/07 19:22:35 gibbs Exp $
*
* Acknowledgements: Many of the algorithms used in this driver are
* inspired by the work of Julian Elischer (julian@tfs.com) and
@ -639,13 +639,13 @@ static int aic_debug = 0; /* AIC_SHOWSTART|AIC_SHOWMISC|AIC_SHOWTRAC; */
static int aicprobe __P((struct isa_device *));
static int aicattach __P((struct isa_device *));
static void aic_minphys __P((struct buf *));
static u_int32 aic_adapter_info __P((int));
static u_int32_t aic_adapter_info __P((int));
static void aic_init __P((struct aic_data *));
static int aic_find __P((struct aic_data *));
static void aic_done __P((struct acb *));
static void aic_dataout __P((struct aic_data *aic));
static void aic_datain __P((struct aic_data *aic));
static int32 aic_scsi_cmd __P((struct scsi_xfer *));
static int32_t aic_scsi_cmd __P((struct scsi_xfer *));
static int aic_poll __P((struct aic_data *aic, struct acb *));
void aic_add_timeout __P((struct acb *, int));
void aic_remove_timeout __P((struct acb *));
@ -990,7 +990,7 @@ aic_init(aic)
* This function is called by the higher level SCSI-driver to queue/run
* SCSI-commands.
*/
static int32
static int32_t
aic_scsi_cmd(xs)
struct scsi_xfer *xs;
{
@ -1072,7 +1072,7 @@ aic_minphys(bp)
}
static u_int32
static u_int32_t
aic_adapter_info(unit)
int unit;
{

4
sys/i386/isa/isa.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* $Id: isa.c,v 1.63 1996/01/27 02:33:36 bde Exp $
* $Id: isa.c,v 1.64 1996/03/10 02:10:27 jkh Exp $
*/
/*
@ -270,8 +270,6 @@ isa_configure() {
dev_attach(&kdc_isa0);
splhigh();
enable_intr();
INTREN(IRQ_SLAVE);
printf("Probing for devices on the ISA bus:\n");
/* First probe all the sensitive probes */
for (dvp = isa_devtab_tty; dvp->id_driver; dvp++)

10
sys/i386/isa/ncr5380.c
View File

@ -130,7 +130,7 @@ typedef struct scb {
struct scb *next; /* in free list */
struct scsi_xfer *xfer; /* the scsi_xfer for this cmd */
u_char *data; /* position in data buffer so far */
int32 datalen; /* bytes remaining to transfer */;
int32_t datalen; /* bytes remaining to transfer */;
} scb_t;
typedef enum {
@ -216,8 +216,8 @@ static adapter_t ncadata[NNCA];
static int nca_probe (struct isa_device *dev);
static int nca_attach (struct isa_device *dev);
static int32 nca_scsi_cmd (struct scsi_xfer *xs);
static u_int32 nca_adapter_info (int unit);
static int32_t nca_scsi_cmd (struct scsi_xfer *xs);
static u_int32_t nca_adapter_info (int unit);
static void nca_timeout (void *scb);
static void ncaminphys (struct buf *bp);
static void nca_done (adapter_t *z, scb_t *scb);
@ -526,7 +526,7 @@ int nca_attach (struct isa_device *dev)
* Return some information to the caller about
* the adapter and its capabilities.
*/
u_int32 nca_adapter_info (int unit)
u_int32_t nca_adapter_info (int unit)
{
return (1);
}
@ -574,7 +574,7 @@ void nca_tick (void *arg)
* Also needs the unit, target and lu. Get a free scb and set it up.
* Call send_scb. Either start timer or wait until done.
*/
int32 nca_scsi_cmd (struct scsi_xfer *xs)
int32_t nca_scsi_cmd (struct scsi_xfer *xs)
{
int unit = xs->sc_link->adapter_unit, flags = xs->flags, x = 0;
adapter_t *z = (adapter_t *)xs->sc_link->adapter_softc;

12
sys/i386/isa/seagate.c
View File

@ -60,7 +60,7 @@
* that category, with the possible exception of scanners and
* some of the older MO drives.
*
* $Id: seagate.c,v 1.15 1995/12/10 13:39:10 phk Exp $
* $Id: seagate.c,v 1.16 1996/01/07 19:22:37 gibbs Exp $
*/
/*
@ -223,7 +223,7 @@ typedef struct scb {
struct scb *next; /* in free list */
struct scsi_xfer *xfer; /* the scsi_xfer for this cmd */
u_char *data; /* position in data buffer so far */
int32 datalen; /* bytes remaining to transfer */;
int32_t datalen; /* bytes remaining to transfer */;
} scb_t;
typedef enum {
@ -336,8 +336,8 @@ static adapter_t seadata[NSEA];
static int sea_probe (struct isa_device *dev);
static int sea_detect (adapter_t *z, struct isa_device *dev);
static int sea_attach (struct isa_device *dev);
static int32 sea_scsi_cmd (struct scsi_xfer *xs);
static u_int32 sea_adapter_info (int unit);
static int32_t sea_scsi_cmd (struct scsi_xfer *xs);
static u_int32_t sea_adapter_info (int unit);
static void sea_timeout (void *scb);
static void seaminphys (struct buf *bp);
static void sea_done (adapter_t *z, scb_t *scb);
@ -582,7 +582,7 @@ int sea_attach (struct isa_device *dev)
* Return some information to the caller about
* the adapter and its capabilities.
*/
u_int32 sea_adapter_info (int unit)
u_int32_t sea_adapter_info (int unit)
{
return (1);
}
@ -625,7 +625,7 @@ void sea_tick (void *arg)
* Also needs the unit, target and lu. Get a free scb and set it up.
* Call send_scb. Either start timer or wait until done.
*/
int32 sea_scsi_cmd (struct scsi_xfer *xs)
int32_t sea_scsi_cmd (struct scsi_xfer *xs)
{
int flags = xs->flags, x = 0;
adapter_t *z = (adapter_t *)xs->sc_link->adapter_softc;

10
sys/i386/isa/ultra14f.c
View File

@ -22,7 +22,7 @@
* today: Fri Jun 2 17:21:03 EST 1994
* added 24F support ++sg
*
* $Id: ultra14f.c,v 1.44 1996/01/07 19:22:39 gibbs Exp $
* $Id: ultra14f.c,v 1.45 1996/01/15 16:15:27 phk Exp $
*/
#include <sys/types.h>
@ -269,7 +269,7 @@ static struct uha_data {
} *uhadata[NUHA];
static int uha_abort __P((struct uha_data *uha, struct mscp *mscp));
static u_int32 uha_adapter_info __P((int unit));
static u_int32_t uha_adapter_info __P((int unit));
static int uha_attach __P((struct isa_device *dev));
static void uha_done __P((struct uha_data *uha, struct mscp *mscp));
static void uha_free_mscp __P((struct uha_data *uha, struct mscp *mscp,
@ -287,7 +287,7 @@ static void uha_print_active_mscp __P((struct uha_data *uha));
static void uha_print_mscp __P((struct mscp *mscp));
#endif
static int uhaprobe __P((struct isa_device *dev));
static int32 uha_scsi_cmd __P((struct scsi_xfer *xs));
static int32_t uha_scsi_cmd __P((struct scsi_xfer *xs));
static void uha_send_mbox __P((struct uha_data *uha, struct mscp *mscp));
static timeout_t
uha_timeout;
@ -583,7 +583,7 @@ uha_attach(dev)
* Return some information to the caller about
* the adapter and it's capabilities
*/
u_int32
u_int32_t
uha_adapter_info(unit)
int unit;
{
@ -1073,7 +1073,7 @@ uhaminphys(bp)
* start a scsi operation given the command and the data address. Also
* needs the unit, target and lu.
*/
static int32
static int32_t
uha_scsi_cmd(xs)
struct scsi_xfer *xs;
{