<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2010-05-27)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>
* libfs/src/nfsclient/src/nfs.c (NFS_MAKE_DEV_T_INO_HACK,
NFS_MAKE_DEV_T): Cast "id"'s to rtems_device_minor_number.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2313&r2=text&tr2=1.2314&diff_format=h">M</a></td><td width='1%'>1.2314</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/nfsclient/src/nfs.c.diff?r1=text&tr1=1.17&r2=text&tr2=1.18&diff_format=h">M</a></td><td width='1%'>1.18</td><td width='100%'>cpukit/libfs/src/nfsclient/src/nfs.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2313 rtems/cpukit/ChangeLog:1.2314
--- rtems/cpukit/ChangeLog:1.2313 Thu May 27 02:41:51 2010
+++ rtems/cpukit/ChangeLog Thu May 27 04:42:14 2010
</font><font color='#997700'>@@ -1,5 +1,10 @@
</font> 2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * libfs/src/nfsclient/src/nfs.c (NFS_MAKE_DEV_T_INO_HACK,
+ NFS_MAKE_DEV_T): Cast "id"'s to rtems_device_minor_number.
+
+2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>
+
</font> * libfs/src/nfsclient/src/rpcio.c, libfs/src/nfsclient/src/rpcio.h:
Use rpcprog_t for "program args", use rpcvers_t for "version args".
<font color='#006600'>diff -u rtems/cpukit/libfs/src/nfsclient/src/nfs.c:1.17 rtems/cpukit/libfs/src/nfsclient/src/nfs.c:1.18
--- rtems/cpukit/libfs/src/nfsclient/src/nfs.c:1.17 Fri Mar 12 10:26:14 2010
+++ rtems/cpukit/libfs/src/nfsclient/src/nfs.c Thu May 27 04:42:14 2010
</font><font color='#997700'>@@ -157,14 +157,14 @@
</font>
#define NFS_MAKE_DEV_T_INO_HACK(node) \
rtems_filesystem_make_dev_t( NFS_MAJOR, \
<font color='#880000'>- (((node)->nfs->id)<<16) | (SERP_ATTR((node)).fileid >> 16) )
</font><font color='#000088'>+ (((rtems_device_minor_number)((node)->nfs->id))<<16) | (((rtems_device_minor_number)SERP_ATTR((node)).fileid) >> 16) )
</font>
/* use our 'nfs id' and the server's fsid for the minor device number
* this should be fairly unique
*/
#define NFS_MAKE_DEV_T(node) \
rtems_filesystem_make_dev_t( NFS_MAJOR, \
<font color='#880000'>- (((node)->nfs->id)<<16) | (SERP_ATTR((node)).fsid & ((1<<16)-1)) )
</font><font color='#000088'>+ (((rtems_device_minor_number)((node)->nfs->id))<<16) | (SERP_ATTR((node)).fsid & (((rtems_device_minor_number)1<<16)-1)) )
</font>
#define DIRENT_HEADER_SIZE ( sizeof(struct dirent) - \
sizeof( ((struct dirent *)0)->d_name ) )
</pre>
<p> </p>
<a name='cs2'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>
* libfs/src/nfsclient/src/rpcio.c:
Cast pointers to uintptr_t instead of long.
xids are uint32_t not u_long.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2314&r2=text&tr2=1.2315&diff_format=h">M</a></td><td width='1%'>1.2315</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/nfsclient/src/rpcio.c.diff?r1=text&tr1=1.11&r2=text&tr2=1.12&diff_format=h">M</a></td><td width='1%'>1.12</td><td width='100%'>cpukit/libfs/src/nfsclient/src/rpcio.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2314 rtems/cpukit/ChangeLog:1.2315
--- rtems/cpukit/ChangeLog:1.2314 Thu May 27 04:42:14 2010
+++ rtems/cpukit/ChangeLog Thu May 27 04:44:43 2010
</font><font color='#997700'>@@ -1,5 +1,8 @@
</font> 2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * libfs/src/nfsclient/src/rpcio.c:<span style="background-color: #FF0000"> </span>
+ Cast pointers to uintptr_t instead of long.
+ xids are uint32_t not u_long.
</font> * libfs/src/nfsclient/src/nfs.c (NFS_MAKE_DEV_T_INO_HACK,
NFS_MAKE_DEV_T): Cast "id"'s to rtems_device_minor_number.
<font color='#006600'>diff -u rtems/cpukit/libfs/src/nfsclient/src/rpcio.c:1.11 rtems/cpukit/libfs/src/nfsclient/src/rpcio.c:1.12
--- rtems/cpukit/libfs/src/nfsclient/src/rpcio.c:1.11 Thu May 27 02:41:51 2010
+++ rtems/cpukit/libfs/src/nfsclient/src/rpcio.c Thu May 27 04:44:43 2010
</font><font color='#997700'>@@ -288,7 +288,7 @@
</font> } RpcUdpServerRec;
typedef union RpcBufU_ {
<font color='#880000'>- u_long xid;
</font><font color='#000088'>+ uint32_t xid;
</font> char buf[1];
} RpcBufU, *RpcBuf;
<font color='#997700'>@@ -687,9 +687,9 @@
</font> return 0;
}
/* pick a free table slot and initialize the XID */
<font color='#880000'>- rval->obuf.xid = time(0) ^ (unsigned long)rval;
</font><font color='#000088'>+ rval->obuf.xid = time(0) ^ (uintptr_t)rval;
</font> MU_LOCK(hlock);
<font color='#880000'>- rval->obuf.xid = (xidHashSeed++ ^ ((unsigned long)rval>>10)) & XACT_HASH_MSK;
</font><font color='#000088'>+ rval->obuf.xid = (xidHashSeed++ ^ ((uintptr_t)rval>>10)) & XACT_HASH_MSK;
</font> i=j=(rval->obuf.xid & XACT_HASH_MSK);
if (msgQ) {
/* if there's no message queue, refuse to
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>