summaryrefslogtreecommitdiff
path: root/nuttx/fs/nfs/nfs_socket.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-04-20 23:15:41 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-04-20 23:15:41 +0000
commita82c594ec12e6950e7bec190871361fcf95604e8 (patch)
treee9228b754258eb07f54b144a68a1e555c2512f20 /nuttx/fs/nfs/nfs_socket.c
parentb96598f697397ed683d93f97467360e181ff1015 (diff)
downloadpx4-nuttx-a82c594ec12e6950e7bec190871361fcf95604e8.tar.gz
px4-nuttx-a82c594ec12e6950e7bec190871361fcf95604e8.tar.bz2
px4-nuttx-a82c594ec12e6950e7bec190871361fcf95604e8.zip
More NFS updates
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4638 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/fs/nfs/nfs_socket.c')
-rw-r--r--nuttx/fs/nfs/nfs_socket.c26
1 files changed, 20 insertions, 6 deletions
diff --git a/nuttx/fs/nfs/nfs_socket.c b/nuttx/fs/nfs/nfs_socket.c
index 8b0f28660..b13d0cfb2 100644
--- a/nuttx/fs/nfs/nfs_socket.c
+++ b/nuttx/fs/nfs/nfs_socket.c
@@ -82,7 +82,11 @@ static struct rpc_program nfs3_program =
* Public Variables
****************************************************************************/
+uint32_t nfs_true;
+uint32_t nfs_false;
+uint32_t nfs_xdrneg1;
int nfs_ticks;
+struct nfsstats nfsstats;
/****************************************************************************
* Private Functions
@@ -94,10 +98,20 @@ int nfs_ticks;
void nfs_init(void)
{
- rpcclnt_init();
+ nfs_true = txdr_unsigned(TRUE);
+ nfs_false = txdr_unsigned(FALSE);
+ nfs_xdrneg1 = txdr_unsigned(-1);
+
+ nfs_ticks = (CLOCKS_PER_SEC * NFS_TICKINTVL + 500) / 1000;
+ if (nfs_ticks < 1)
+ {
+ nfs_ticks = 1;
+ }
+
+ rpcclnt_init();
}
-int nfsx_connect(struct nfsmount *nmp)
+int nfs_connect(struct nfsmount *nmp)
{
struct rpcclnt *rpc;
int error = 0;
@@ -151,19 +165,19 @@ int nfsx_connect(struct nfsmount *nmp)
/* NFS disconnect. Clean up and unlink. */
-void nfsx_disconnect(struct nfsmount *nmp)
+void nfs_disconnect(struct nfsmount *nmp)
{
rpcclnt_disconnect(nmp->nm_rpcclnt);
}
#ifdef CONFIG_NFS_TCPIP
-void nfsx_safedisconnect(struct nfsmount *nmp)
+void nfs_safedisconnect(struct nfsmount *nmp)
{
rpcclnt_safedisconnect(nmp->nm_rpcclnt);
}
#endif
-int nfsx_request_xx(struct nfsmount *nmp, int procnum, void *datain, void *dataout)
+int nfs_request(struct nfsmount *nmp, int procnum, void *datain, void *dataout)
{
int error;
struct rpcclnt *clnt;
@@ -223,7 +237,7 @@ out:
/* terminate any outstanding RPCs. */
-int nfsx_nmcancelreqs(struct nfsmount *nmp)
+int nfs_nmcancelreqs(struct nfsmount *nmp)
{
return rpcclnt_cancelreqs(nmp->nm_rpcclnt);
}