Module Name: src
Committed By: tsutsui
Date: Fri Sep 4 18:40:19 UTC 2009
Modified Files:
src/sys/dev/ic: esiopvar.h siopreg.h siopvar.h siopvar_common.h
Log Message:
u_intNN_t -> uintNN_t
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ic/esiopvar.h
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/ic/siopreg.h
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/ic/siopvar.h
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/ic/siopvar_common.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/esiopvar.h
diff -u src/sys/dev/ic/esiopvar.h:1.18 src/sys/dev/ic/esiopvar.h:1.19
--- src/sys/dev/ic/esiopvar.h:1.18 Fri Sep 4 18:29:52 2009
+++ src/sys/dev/ic/esiopvar.h Fri Sep 4 18:40:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: esiopvar.h,v 1.18 2009/09/04 18:29:52 tsutsui Exp $ */
+/* $NetBSD: esiopvar.h,v 1.19 2009/09/04 18:40:19 tsutsui Exp $ */
/*
* Copyright (c) 2002 Manuel Bouyer.
@@ -40,10 +40,10 @@
* A_ncmd_slots of this.
*/
struct esiop_slot {
- u_int32_t dsa; /* DSA of the xfer. The first 2 bits holds flags */
+ uint32_t dsa; /* DSA of the xfer. The first 2 bits holds flags */
} __packed;
-#define CMD_SLOTSIZE (sizeof(struct esiop_slot) / sizeof(u_int32_t))
+#define CMD_SLOTSIZE (sizeof(struct esiop_slot) / sizeof(uint32_t))
/*
* xfer description of the script: tables and reselect script
@@ -52,8 +52,8 @@
*/
struct esiop_xfer {
struct siop_common_xfer siop_tables;
- u_int32_t tlq; /* target/lun/tag loaded in scratchC by script */
- u_int32_t saved_offset;/* contains scratchA if script saved an offset */
+ uint32_t tlq; /* target/lun/tag loaded in scratchC by script */
+ uint32_t saved_offset;/* contains scratchA if script saved an offset */
} __packed;
#define ESIOP_XFER(cmd, m) (((struct esiop_xfer *)((cmd)->cmd_tables))->m)
@@ -85,8 +85,8 @@
/* DSA table descriptor for tags. Free tables are in a list */
struct esiop_dsatbl {
TAILQ_ENTRY (esiop_dsatbl) next;
- u_int32_t *tbl; /* the table itself */
- u_int32_t tbl_dsa; /* DSA of base of this table */
+ uint32_t *tbl; /* the table itself */
+ uint32_t tbl_dsa; /* DSA of base of this table */
bus_addr_t tbl_offset; /* offset of this table in the map */
struct esiop_dsatblblk *tblblk; /* pointer back to our block */
};
@@ -101,7 +101,7 @@
TAILQ_HEAD(tblblk_list, esiop_dsatblblk);
/* Number of table per block */
-#define ESIOP_NTPB ((PAGE_SIZE) / (sizeof(u_int32_t) * ESIOP_NTAG))
+#define ESIOP_NTPB ((PAGE_SIZE) / (sizeof(uint32_t) * ESIOP_NTAG))
/* per lun struct */
struct esiop_lun {
@@ -118,7 +118,7 @@
struct esiop_target {
struct siop_common_target target_c;
struct esiop_lun *esiop_lun[8]; /* per-lun state */
- u_int32_t lun_table_offset; /* pointer to our DSA table */
+ uint32_t lun_table_offset; /* pointer to our DSA table */
};
static __inline void esiop_table_sync(struct esiop_cmd *, int);
@@ -139,20 +139,20 @@
/* Driver internal state */
struct esiop_softc {
struct siop_common_softc sc_c;
- u_int32_t sc_semoffset; /* semaphore */
- u_int32_t sc_shedoffset; /* base of scheduler ring */
+ uint32_t sc_semoffset; /* semaphore */
+ uint32_t sc_shedoffset; /* base of scheduler ring */
int sc_currschedslot; /* current scheduler slot */
struct cbd_list cmds; /* list of command block descriptors */
struct cmd_list free_list; /* cmd descr free list */
struct tbl_list free_tagtbl; /* list of free tag DSA tables */
struct tblblk_list tag_tblblk; /* tag DSA table blocks */
- u_int32_t sc_flags;
- u_int32_t sc_free_offset; /* pointer to free RAM */
- u_int32_t sc_target_table_offset;/* pointer to target DSA table */
+ uint32_t sc_flags;
+ uint32_t sc_free_offset; /* pointer to free RAM */
+ uint32_t sc_target_table_offset;/* pointer to target DSA table */
int sc_currdoneslot; /* current done slot */
bus_dmamap_t sc_done_map; /* dma map for done ring (shared) */
bus_addr_t sc_done_offset; /* offset of ring in sc_done_map */
- u_int32_t *sc_done_slot; /* The done ring itself */
+ uint32_t *sc_done_slot; /* The done ring itself */
};
/* defs for sc_flags */
Index: src/sys/dev/ic/siopreg.h
diff -u src/sys/dev/ic/siopreg.h:1.20 src/sys/dev/ic/siopreg.h:1.21
--- src/sys/dev/ic/siopreg.h:1.20 Wed Jun 11 02:09:16 2008
+++ src/sys/dev/ic/siopreg.h Fri Sep 4 18:40:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: siopreg.h,v 1.20 2008/06/11 02:09:16 kiyohara Exp $ */
+/* $NetBSD: siopreg.h,v 1.21 2009/09/04 18:40:19 tsutsui Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@@ -419,89 +419,89 @@
struct nvram_symbios {
/* Header (6 bytes) */
- u_int16_t type; /* 0x0000 */
- u_int16_t byte_count; /* excluding header/trailer */
- u_int16_t checksum;
+ uint16_t type; /* 0x0000 */
+ uint16_t byte_count; /* excluding header/trailer */
+ uint16_t checksum;
/* Adapter configuration (20 bytes) */
- u_int8_t v_major;
- u_int8_t v_minor;
- u_int32_t boot_crc;
- u_int16_t flags;
+ uint8_t v_major;
+ uint8_t v_minor;
+ uint32_t boot_crc;
+ uint16_t flags;
#define NVRAM_SYM_F_SCAM_ENABLE 0x0001
#define NVRAM_SYM_F_PARITY_ENABLE 0x0002
#define NVRAM_SYM_F_VERBOSE_MESSAGES 0x0004
#define NVRAM_SYM_F_CHS_MAPPING 0x0008
- u_int16_t flags1;
+ uint16_t flags1;
#define NVRAM_SYM_F1_SCAN_HI_LO 0x0001
- u_int16_t term_state;
+ uint16_t term_state;
#define NVRAM_SYM_TERM_CANT_PROGRAM 0
#define NVRAM_SYM_TERM_ENABLED 1
#define NVRAM_SYM_TERM_DISABLED 2
- u_int16_t rmvbl_flags;
+ uint16_t rmvbl_flags;
#define NVRAM_SYM_RMVBL_NO_SUPPORT 0
#define NVRAM_SYM_RMVBL_BOOT_DEVICE 1
#define NVRAM_SYM_RMVBL_MEDIA_INSTALLED 2
- u_int8_t host_id;
- u_int8_t num_hba;
- u_int8_t num_devices;
- u_int8_t max_scam_devices;
- u_int8_t num_valid_scam_devices;
- u_int8_t rsvd;
+ uint8_t host_id;
+ uint8_t num_hba;
+ uint8_t num_devices;
+ uint8_t max_scam_devices;
+ uint8_t num_valid_scam_devices;
+ uint8_t rsvd;
/* Boot order (14 bytes x 4) */
struct nvram_symbios_host {
- u_int16_t type; /* 4 - 8xx */
- u_int16_t device_id; /* PCI device ID */
- u_int16_t vendor_id; /* PCI vendor ID */
- u_int8_t bus_nr; /* PCI bus number */
- u_int8_t device_fn; /* PCI device/func # << 3 */
- u_int16_t word8;
- u_int16_t flags;
+ uint16_t type; /* 4 - 8xx */
+ uint16_t device_id; /* PCI device ID */
+ uint16_t vendor_id; /* PCI vendor ID */
+ uint8_t bus_nr; /* PCI bus number */
+ uint8_t device_fn; /* PCI device/func # << 3 */
+ uint16_t word8;
+ uint16_t flags;
#define NVRAM_SYM_HOST_F_SCAN_AT_BOOT 0x0001
- u_int16_t io_port; /* PCI I/O address */
+ uint16_t io_port; /* PCI I/O address */
} __packed host[4];
/* Targets (8 bytes x 16) */
struct nvram_symbios_target {
- u_int8_t flags;
+ uint8_t flags;
#define NVRAM_SYM_TARG_F_DISCONNECT_EN 0x0001
#define NVRAM_SYM_TARG_F_SCAN_AT_BOOT 0x0002
#define NVRAM_SYM_TARG_F_SCAN_LUNS 0x0004
#define NVRAM_SYM_TARG_F_TQ_EN 0x0008
- u_int8_t rsvd;
- u_int8_t bus_width;
- u_int8_t sync_offset; /* 8, 16, etc. */
- u_int16_t sync_period; /* 4 * factor */
- u_int16_t timeout;
+ uint8_t rsvd;
+ uint8_t bus_width;
+ uint8_t sync_offset; /* 8, 16, etc. */
+ uint16_t sync_period; /* 4 * factor */
+ uint16_t timeout;
} __packed target[16];
/* SCAM table (8 bytes x 4) */
struct nvram_symbios_scam {
- u_int16_t id;
- u_int16_t method;
+ uint16_t id;
+ uint16_t method;
#define NVRAM_SYM_SCAM_DEFAULT_METHOD 0
#define NVRAM_SYM_SCAM_DONT_ASSIGN 1
#define NVRAM_SYM_SCAM_SET_SPECIFIC_ID 2
#define NVRAM_SYM_SCAM_USE_ORDER_GIVEN 3
- u_int16_t status;
+ uint16_t status;
#define NVRAM_SYM_SCAM_UNKNOWN 0
#define NVRAM_SYM_SCAM_DEVICE_NOT_FOUND 1
#define NVRAM_SYM_SCAM_ID_NOT_SET 2
#define NVRAM_SYM_SCAM_ID_VALID 3
- u_int8_t target_id;
- u_int8_t rsvd;
+ uint8_t target_id;
+ uint8_t rsvd;
} __packed scam[4];
- u_int8_t spare_devices[15 * 8];
- u_int8_t trailer[6]; /* 0xfe 0xfe 0x00 0x00 0x00 0x00 */
+ uint8_t spare_devices[15 * 8];
+ uint8_t trailer[6]; /* 0xfe 0xfe 0x00 0x00 0x00 0x00 */
} __packed;
#define SIOP_NVRAM_TEK_SIZE 64
#define SIOP_NVRAM_TEK_93c46_ADDRESS 0
#define SIOP_NVRAM_TEK_24c16_ADDRESS 0x40
-static const u_int8_t tekram_sync_table[16] __unused = {
+static const uint8_t tekram_sync_table[16] __unused = {
25, 31, 37, 43,
50, 62, 75, 125,
12, 15, 18, 21,
@@ -510,18 +510,18 @@
struct nvram_tekram {
struct nvram_tekram_target {
- u_int8_t flags;
+ uint8_t flags;
#define NVRAM_TEK_TARG_F_PARITY_CHECK 0x01
#define NVRAM_TEK_TARG_F_SYNC_NEGO 0x02
#define NVRAM_TEK_TARG_F_DISCONNECT_EN 0x04
#define NVRAM_TEK_TARG_F_START_CMD 0x08
#define NVRAM_TEK_TARG_F_TQ_EN 0x10
#define NVRAM_TEK_TARG_F_WIDE_NEGO 0x20
- u_int8_t sync_index;
- u_int16_t word2;
+ uint8_t sync_index;
+ uint16_t word2;
} __packed target[16];
- u_int8_t host_id;
- u_int8_t flags;
+ uint8_t host_id;
+ uint8_t flags;
#define NVRAM_TEK_F_MORE_THAN_2_DRIVES 0x01
#define NVRAM_TEK_F_DRIVES_SUP_1G 0x02
#define NVRAM_TEK_F_RESET_ON_POWER_ON 0x04
@@ -529,9 +529,9 @@
#define NVRAM_TEK_F_IMMEDIATE_SEEK 0x10
#define NVRAM_TEK_F_SCAN_LUNS 0x20
#define NVRAM_TEK_F_REMOVABLE_FLAGS 0xc0 /* 0 dis, 1 boot, 2 all */
- u_int8_t boot_delay_index;
- u_int8_t max_tags_index;
- u_int16_t flags1;
+ uint8_t boot_delay_index;
+ uint8_t max_tags_index;
+ uint16_t flags1;
#define NVRAM_TEK_F_F2_F6_ENABLED 0x0001
- u_int16_t spare[29];
+ uint16_t spare[29];
} __packed;
Index: src/sys/dev/ic/siopvar.h
diff -u src/sys/dev/ic/siopvar.h:1.26 src/sys/dev/ic/siopvar.h:1.27
--- src/sys/dev/ic/siopvar.h:1.26 Sun Mar 15 17:24:43 2009
+++ src/sys/dev/ic/siopvar.h Fri Sep 4 18:40:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: siopvar.h,v 1.26 2009/03/15 17:24:43 cegger Exp $ */
+/* $NetBSD: siopvar.h,v 1.27 2009/09/04 18:40:19 tsutsui Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@@ -41,8 +41,8 @@
*/
struct siop_xfer {
struct siop_common_xfer siop_tables;
- /* u_int32_t resel[sizeof(load_dsa) / sizeof(load_dsa[0])]; */
- u_int32_t resel[25];
+ /* uint32_t resel[sizeof(load_dsa) / sizeof(load_dsa[0])]; */
+ uint32_t resel[25];
} __packed;
/*
@@ -56,7 +56,7 @@
struct siop_common_cmd cmd_c;
struct siop_cbd *siop_cbdp; /* pointer to our siop_cbd */
int reselslot;
- u_int32_t saved_offset; /* offset in table after disc without sdp */
+ uint32_t saved_offset; /* offset in table after disc without sdp */
};
#define cmd_tables cmd_c.siop_tables
@@ -94,8 +94,8 @@
struct siop_lunsw {
TAILQ_ENTRY (siop_lunsw) next;
- u_int32_t lunsw_off; /* offset of this lun sw, from sc_scriptaddr*/
- u_int32_t lunsw_size; /* size of this lun sw */
+ uint32_t lunsw_off; /* offset of this lun sw, from sc_scriptaddr*/
+ uint32_t lunsw_size; /* size of this lun sw */
};
static __inline void siop_table_sync(struct siop_cmd *, int);
@@ -124,10 +124,10 @@
struct cbd_list cmds; /* list of command block descriptors */
struct cmd_list free_list; /* cmd descr free list */
struct lunsw_list lunsw_list; /* lunsw free list */
- u_int32_t script_free_lo; /* free ram offset from sc_scriptaddr */
- u_int32_t script_free_hi; /* free ram offset from sc_scriptaddr */
+ uint32_t script_free_lo; /* free ram offset from sc_scriptaddr */
+ uint32_t script_free_hi; /* free ram offset from sc_scriptaddr */
int sc_ntargets; /* number of known targets */
- u_int32_t sc_flags;
+ uint32_t sc_flags;
};
/* defs for sc_flags */
Index: src/sys/dev/ic/siopvar_common.h
diff -u src/sys/dev/ic/siopvar_common.h:1.38 src/sys/dev/ic/siopvar_common.h:1.39
--- src/sys/dev/ic/siopvar_common.h:1.38 Fri Sep 4 18:29:52 2009
+++ src/sys/dev/ic/siopvar_common.h Fri Sep 4 18:40:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: siopvar_common.h,v 1.38 2009/09/04 18:29:52 tsutsui Exp $ */
+/* $NetBSD: siopvar_common.h,v 1.39 2009/09/04 18:40:19 tsutsui Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@@ -40,8 +40,8 @@
/* tables used by SCRIPT */
typedef struct scr_table {
- u_int32_t count;
- u_int32_t addr;
+ uint32_t count;
+ uint32_t addr;
} __packed scr_table_t;
/* Number of scatter/gather entries */
@@ -53,12 +53,12 @@
* If you change something here, don't forget to update offsets in {s,es}iop.ss
*/
struct siop_common_xfer {
- u_int8_t msg_out[16]; /* 0 */
- u_int8_t msg_in[16]; /* 16 */
- u_int32_t status; /* 32 */
- u_int32_t pad1; /* 36 */
- u_int32_t id; /* 40 */
- u_int32_t pad2; /* 44 */
+ uint8_t msg_out[16]; /* 0 */
+ uint8_t msg_in[16]; /* 16 */
+ uint32_t status; /* 32 */
+ uint32_t pad1; /* 36 */
+ uint32_t id; /* 40 */
+ uint32_t pad2; /* 44 */
scr_table_t t_msgin; /* 48 */
scr_table_t t_extmsgin; /* 56 */
scr_table_t t_extmsgdata; /* 64 */
@@ -106,7 +106,7 @@
struct siop_common_target {
int status; /* target status, see below */
int flags; /* target flags, see below */
- u_int32_t id; /* for SELECT FROM */
+ uint32_t id; /* for SELECT FROM */
int period;
int offset;
};
@@ -152,7 +152,7 @@
void (*sc_reset)(struct siop_common_softc*); /* reset callback */
bus_dmamap_t sc_scriptdma; /* DMA map for script */
bus_addr_t sc_scriptaddr; /* on-board ram or physical address */
- u_int32_t *sc_script; /* script location in memory */
+ uint32_t *sc_script; /* script location in memory */
struct siop_common_target *targets[16]; /* per-target states */
};
