From: Ben Gras <ben@minix3.org>
Date: Mon, 24 Feb 2014 16:30:31 +0000 (+0100)
Subject: 64-bit CDEV_POS
X-Git-Tag: v3.3.0~421
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/doc/processing.js?a=commitdiff_plain;h=273c51a7d12aa1929b2ca1afd5afbee44a8dac91;p=minix.git

64-bit CDEV_POS

Change-Id: Iecdadf3dd92cc14525961976f51a9eb16a996d62
---

diff --git a/include/minix/com.h b/include/minix/com.h
index 9cf61dfc9..d63545452 100644
--- a/include/minix/com.h
+++ b/include/minix/com.h
@@ -1196,8 +1196,7 @@
 #define CDEV_FLAGS	m10_i4	/* transfer flags */
 #define CDEV_ID		m10_l1	/* opaque request ID */
 #define CDEV_REQUEST	m10_l2	/* I/O control request */
-#define CDEV_POS_LO	m10_l2	/* transfer position (low bits) */
-#define CDEV_POS_HI	m10_l3	/* transfer position (high bits) */
+#define CDEV_POS	m10_ull1 /* transfer position */
 
 /* Bits in 'CDEV_ACCESS' field of block device open requests. */
 #  define CDEV_R_BIT		0x01	/* open with read access */
diff --git a/lib/libchardriver/chardriver.c b/lib/libchardriver/chardriver.c
index 7016eb8da..a8de1ad40 100644
--- a/lib/libchardriver/chardriver.c
+++ b/lib/libchardriver/chardriver.c
@@ -322,7 +322,7 @@ static int do_transfer(struct chardriver *cdp, message *m_ptr, int do_write)
   ssize_t r;
 
   minor = m_ptr->CDEV_MINOR;
-  position = make64(m_ptr->CDEV_POS_LO, m_ptr->CDEV_POS_HI);
+  position = m_ptr->CDEV_POS;
   endpt = m_ptr->m_source;
   grant = (cp_grant_id_t) m_ptr->CDEV_GRANT;
   size = m_ptr->CDEV_COUNT;
diff --git a/servers/vfs/device.c b/servers/vfs/device.c
index 071d4aa1a..b5178bcbd 100644
--- a/servers/vfs/device.c
+++ b/servers/vfs/device.c
@@ -286,8 +286,7 @@ int cdev_io(
 	dev_mess.CDEV_REQUEST = bytes;
 	dev_mess.CDEV_USER = proc_e;
   } else {
-	dev_mess.CDEV_POS_LO = ex64lo(pos);
-	dev_mess.CDEV_POS_HI = ex64hi(pos);
+	dev_mess.CDEV_POS = pos;
 	dev_mess.CDEV_COUNT = (size_t) bytes;
   }
   dev_mess.CDEV_ID = proc_e;