PERFORCE change 32533 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=32533

Change 32533 by peter at peter_hammer on 2003/06/03 22:34:48

	GRRR. Make this compile on a 64 bit system.

Affected files ...

.. //depot/projects/hammer/sys/dev/ips/ips_commands.c#2 edit
.. //depot/projects/hammer/sys/dev/ips/ips_disk.c#2 edit

Differences ...

==== //depot/projects/hammer/sys/dev/ips/ips_commands.c#2 (text+ko) ====

@@ -97,7 +97,7 @@
 	}
 	command_struct = (ips_io_cmd *)command->command_buffer;
 	command_struct->id = command->id;
-	command_struct->drivenum = (uint32_t)iobuf->bio_driver1;
+	command_struct->drivenum = (uintptr_t)iobuf->bio_driver1;
 	if(segnum != 1){
 		if(ips_read_request(iobuf))
 			cmdtype = IPS_SG_READ_CMD;

==== //depot/projects/hammer/sys/dev/ips/ips_disk.c#2 (text+ko) ====

@@ -97,7 +97,7 @@
 
 	dsc = iobuf->bio_disk->d_drv1;	
 	DEVICE_PRINTF(8,dsc->dev,"in strategy\n");
-	(uint32_t)iobuf->bio_driver1 = dsc->sc->drives[dsc->disk_number].drivenum;
+	iobuf->bio_driver1 = (void *)(uintptr_t)dsc->sc->drives[dsc->disk_number].drivenum;
 	ips_start_io_request(dsc->sc, iobuf);
 }
 
@@ -122,7 +122,7 @@
 	dsc->dev = dev;
 	dsc->sc = device_get_softc(adapter);
 	dsc->unit = device_get_unit(dev);
-	dsc->disk_number = (int) device_get_ivars(dev);
+	dsc->disk_number = (uintptr_t) device_get_ivars(dev);
 	dsc->ipsd_disk.d_drv1 = dsc;
 	dsc->ipsd_disk.d_name = "ipsd";
 	dsc->ipsd_disk.d_maxsize = IPS_MAX_IO_SIZE;