From owner-p4-projects@FreeBSD.ORG  Tue Jun  3 22:35:30 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 11A2437B404; Tue,  3 Jun 2003 22:35:30 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A25D237B401
	for <perforce@freebsd.org>; Tue,  3 Jun 2003 22:35:29 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 48B0943F75
	for <perforce@freebsd.org>; Tue,  3 Jun 2003 22:35:29 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h545ZT0U052154
	for <perforce@freebsd.org>; Tue, 3 Jun 2003 22:35:29 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h545ZScs052151
	for perforce@freebsd.org; Tue, 3 Jun 2003 22:35:28 -0700 (PDT)
Date: Tue, 3 Jun 2003 22:35:28 -0700 (PDT)
Message-Id: <200306040535.h545ZScs052151@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 32533 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jun 2003 05:35:31 -0000

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

Change 32533 by peter@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;