D33636.id100508.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D33636.id100508.diff
View Options

	Index: sys/isa/isavar.h
	===================================================================
	--- sys/isa/isavar.h
	+++ sys/isa/isavar.h
	@@ -79,17 +79,17 @@
	* ISA_ADD_CONFIG().
	*/
	struct isa_range {
	- u_int32_t ir_start;
	- u_int32_t ir_end;
	- u_int32_t ir_size;
	- u_int32_t ir_align;
	+ uint32_t ir_start;
	+ uint32_t ir_end;
	+ uint32_t ir_size;
	+ uint32_t ir_align;
	};

	struct isa_config {
	struct isa_range ic_mem[ISA_NMEM];
	struct isa_range ic_port[ISA_NPORT];
	- u_int32_t ic_irqmask[ISA_NIRQ];
	- u_int32_t ic_drqmask[ISA_NDRQ];
	+ uint32_t ic_irqmask[ISA_NIRQ];
	+ uint32_t ic_drqmask[ISA_NDRQ];
	int ic_nmem;
	int ic_nport;
	int ic_nirq;
	@@ -100,7 +100,7 @@
	* Used to build lists of IDs and description strings for PnP drivers.
	*/
	struct isa_pnp_id {
	- u_int32_t ip_id;
	+ uint32_t ip_id;
	const char *ip_desc;
	};

	Index: sys/isa/pnpparse.c
	===================================================================
	--- sys/isa/pnpparse.c
	+++ sys/isa/pnpparse.c
	@@ -47,7 +47,7 @@
	#define I32(p) (I16(p) + (I16((p)+2) << 16))

	void
	-pnp_printf(u_int32_t id, char *fmt, ...)
	+pnp_printf(uint32_t id, char *fmt, ...)
	{
	va_list ap;

	@@ -64,8 +64,8 @@
	struct isa_config *config, int ldn)
	{
	char buf[100];
	- u_int32_t id;
	- u_int32_t compat_id;
	+ uint32_t id;
	+ uint32_t compat_id;
	int temp;

	id = isa_get_logicalid(dev);
	@@ -414,7 +414,7 @@
	u_char *start;
	u_char *p;
	u_char tag;
	- u_int32_t id;
	+ uint32_t id;
	int ncfgs;
	int l;
	int i;