sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

net: cosmetic: nfs.* checkpatch compliance 

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Joe Hershberger 2012-05-15 08:59:09 +00:00
parent 48522bb503
commit c9f6c91b48
2 changed files with 150 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

300
net/nfs.c
View File

@ -33,8 +33,8 @@
#define NFS_RETRY_COUNT 30 #define NFS_RETRY_COUNT 30
#define NFS_TIMEOUT 2000UL #define NFS_TIMEOUT 2000UL
static int fs_mounted = 0; static int fs_mounted;
static unsigned long rpc_id = 0; static unsigned long rpc_id;
static int nfs_offset = -1; static int nfs_offset = -1;
static int nfs_len; static int nfs_len;
@ -61,14 +61,14 @@ static char *nfs_filename;
static char *nfs_path; static char *nfs_path;
static char nfs_path_buff[2048]; static char nfs_path_buff[2048];
static __inline__ int static inline int
store_block (uchar * src, unsigned offset, unsigned len) store_block(uchar *src, unsigned offset, unsigned len)
{ {
ulong newsize = offset + len; ulong newsize = offset + len;
#ifdef CONFIG_SYS_DIRECT_FLASH_NFS #ifdef CONFIG_SYS_DIRECT_FLASH_NFS
int i, rc = 0; int i, rc = 0;
for (i=0; i<CONFIG_SYS_MAX_FLASH_BANKS; i++) { for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
/* start address in flash? */ /* start address in flash? */
if (load_addr + offset >= flash_info[i].start[0]) { if (load_addr + offset >= flash_info[i].start[0]) {
rc = 1; rc = 1;
@ -77,15 +77,15 @@ store_block (uchar * src, unsigned offset, unsigned len)
} }
if (rc) { /* Flash is destination for this packet */ if (rc) { /* Flash is destination for this packet */
rc = flash_write ((uchar *)src, (ulong)(load_addr+offset), len); rc = flash_write((uchar *)src, (ulong)(load_addr+offset), len);
if (rc) { if (rc) {
flash_perror (rc); flash_perror(rc);
return -1; return -1;
} }
} else } else
#endif /* CONFIG_SYS_DIRECT_FLASH_NFS */ #endif /* CONFIG_SYS_DIRECT_FLASH_NFS */
{ {
(void)memcpy ((void *)(load_addr + offset), src, len); (void)memcpy((void *)(load_addr + offset), src, len);
} }
if (NetBootFileXferSize < (offset+len)) if (NetBootFileXferSize < (offset+len))
@ -94,7 +94,7 @@ store_block (uchar * src, unsigned offset, unsigned len)
} }
static char* static char*
basename (char *path) basename(char *path)
{ {
char *fname; char *fname;
@ -110,11 +110,11 @@ basename (char *path)
} }
static char* static char*
dirname (char *path) dirname(char *path)
{ {
char *fname; char *fname;
fname = basename (path); fname = basename(path);
--fname; --fname;
*fname = '\0'; *fname = '\0';
return path; return path;
@ -123,14 +123,14 @@ dirname (char *path)
/************************************************************************** /**************************************************************************
RPC_ADD_CREDENTIALS - Add RPC authentication/verifier entries RPC_ADD_CREDENTIALS - Add RPC authentication/verifier entries
**************************************************************************/ **************************************************************************/
static long *rpc_add_credentials (long *p) static long *rpc_add_credentials(long *p)
{ {
int hl; int hl;
int hostnamelen; int hostnamelen;
char hostname[256]; char hostname[256];
strcpy (hostname, ""); strcpy(hostname, "");
hostnamelen=strlen (hostname); hostnamelen = strlen(hostname);
/* Here's the executive summary on authentication requirements of the /* Here's the executive summary on authentication requirements of the
* various NFS server implementations: Linux accepts both AUTH_NONE * various NFS server implementations: Linux accepts both AUTH_NONE
@ -148,10 +148,9 @@ static long *rpc_add_credentials (long *p)
*p++ = htonl(hl+20); /* auth length */ *p++ = htonl(hl+20); /* auth length */
*p++ = htonl(0); /* stamp */ *p++ = htonl(0); /* stamp */
*p++ = htonl(hostnamelen); /* hostname string */ *p++ = htonl(hostnamelen); /* hostname string */
if (hostnamelen & 3) { if (hostnamelen & 3)
*(p + hostnamelen / 4) = 0; /* add zero padding */ *(p + hostnamelen / 4) = 0; /* add zero padding */
} memcpy(p, hostname, hostnamelen);
memcpy (p, hostname, hostnamelen);
p += hl / 4; p += hl / 4;
*p++ = 0; /* uid */ *p++ = 0; /* uid */
*p++ = 0; /* gid */ *p++ = 0; /* gid */
@ -168,7 +167,7 @@ static long *rpc_add_credentials (long *p)
RPC_LOOKUP - Lookup RPC Port numbers RPC_LOOKUP - Lookup RPC Port numbers
**************************************************************************/ **************************************************************************/
static void static void
rpc_req (int rpc_prog, int rpc_proc, uint32_t *data, int datalen) rpc_req(int rpc_prog, int rpc_proc, uint32_t *data, int datalen)
{ {
struct rpc_t pkt; struct rpc_t pkt;
unsigned long id; unsigned long id;
@ -186,11 +185,12 @@ rpc_req (int rpc_prog, int rpc_proc, uint32_t *data, int datalen)
p = (uint32_t *)&(pkt.u.call.data); p = (uint32_t *)&(pkt.u.call.data);
if (datalen) if (datalen)
memcpy ((char *)p, (char *)data, datalen*sizeof(uint32_t)); memcpy((char *)p, (char *)data, datalen*sizeof(uint32_t));
pktlen = (char *)p + datalen*sizeof(uint32_t) - (char *)&pkt; pktlen = (char *)p + datalen*sizeof(uint32_t) - (char *)&pkt;
memcpy ((char *)NetTxPacket + NetEthHdrSize() + IP_HDR_SIZE, (char *)&pkt, pktlen); memcpy((char *)NetTxPacket + NetEthHdrSize() + IP_HDR_SIZE,
(char *)&pkt, pktlen);
if (rpc_prog == PROG_PORTMAP) if (rpc_prog == PROG_PORTMAP)
sport = SUNRPC_PORT; sport = SUNRPC_PORT;
@ -199,14 +199,15 @@ rpc_req (int rpc_prog, int rpc_proc, uint32_t *data, int datalen)
else else
sport = NfsSrvNfsPort; sport = NfsSrvNfsPort;
NetSendUDPPacket (NetServerEther, NfsServerIP, sport, NfsOurPort, pktlen); NetSendUDPPacket(NetServerEther, NfsServerIP, sport, NfsOurPort,
pktlen);
} }
/************************************************************************** /**************************************************************************
RPC_LOOKUP - Lookup RPC Port numbers RPC_LOOKUP - Lookup RPC Port numbers
**************************************************************************/ **************************************************************************/
static void static void
rpc_lookup_req (int prog, int ver) rpc_lookup_req(int prog, int ver)
{ {
uint32_t data[16]; uint32_t data[16];
@ -217,56 +218,56 @@ rpc_lookup_req (int prog, int ver)
data[6] = htonl(17); /* IP_UDP */ data[6] = htonl(17); /* IP_UDP */
data[7] = 0; data[7] = 0;
rpc_req (PROG_PORTMAP, PORTMAP_GETPORT, data, 8); rpc_req(PROG_PORTMAP, PORTMAP_GETPORT, data, 8);
} }
/************************************************************************** /**************************************************************************
NFS_MOUNT - Mount an NFS Filesystem NFS_MOUNT - Mount an NFS Filesystem
**************************************************************************/ **************************************************************************/
static void static void
nfs_mount_req (char *path) nfs_mount_req(char *path)
{ {
uint32_t data[1024]; uint32_t data[1024];
uint32_t *p; uint32_t *p;
int len; int len;
int pathlen; int pathlen;
pathlen = strlen (path); pathlen = strlen(path);
p = &(data[0]); p = &(data[0]);
p = (uint32_t *)rpc_add_credentials((long *)p); p = (uint32_t *)rpc_add_credentials((long *)p);
*p++ = htonl(pathlen); *p++ = htonl(pathlen);
if (pathlen & 3) *(p + pathlen / 4) = 0; if (pathlen & 3)
memcpy (p, path, pathlen); *(p + pathlen / 4) = 0;
memcpy(p, path, pathlen);
p += (pathlen + 3) / 4; p += (pathlen + 3) / 4;
len = (uint32_t *)p - (uint32_t *)&(data[0]); len = (uint32_t *)p - (uint32_t *)&(data[0]);
rpc_req (PROG_MOUNT, MOUNT_ADDENTRY, data, len); rpc_req(PROG_MOUNT, MOUNT_ADDENTRY, data, len);
} }
/************************************************************************** /**************************************************************************
NFS_UMOUNTALL - Unmount all our NFS Filesystems on the Server NFS_UMOUNTALL - Unmount all our NFS Filesystems on the Server
**************************************************************************/ **************************************************************************/
static void static void
nfs_umountall_req (void) nfs_umountall_req(void)
{ {
uint32_t data[1024]; uint32_t data[1024];
uint32_t *p; uint32_t *p;
int len; int len;
if ((NfsSrvMountPort == -1) || (!fs_mounted)) { if ((NfsSrvMountPort == -1) || (!fs_mounted))
/* Nothing mounted, nothing to umount */ /* Nothing mounted, nothing to umount */
return; return;
}
p = &(data[0]); p = &(data[0]);
p = (uint32_t *)rpc_add_credentials ((long *)p); p = (uint32_t *)rpc_add_credentials((long *)p);
len = (uint32_t *)p - (uint32_t *)&(data[0]); len = (uint32_t *)p - (uint32_t *)&(data[0]);
rpc_req (PROG_MOUNT, MOUNT_UMOUNTALL, data, len); rpc_req(PROG_MOUNT, MOUNT_UMOUNTALL, data, len);
} }
/*************************************************************************** /***************************************************************************
@ -277,65 +278,66 @@ nfs_umountall_req (void)
* so that inside the nfs() function a recursion can be done. * so that inside the nfs() function a recursion can be done.
**************************************************************************/ **************************************************************************/
static void static void
nfs_readlink_req (void) nfs_readlink_req(void)
{ {
uint32_t data[1024]; uint32_t data[1024];
uint32_t *p; uint32_t *p;
int len; int len;
p = &(data[0]); p = &(data[0]);
p = (uint32_t *)rpc_add_credentials ((long *)p); p = (uint32_t *)rpc_add_credentials((long *)p);
memcpy (p, filefh, NFS_FHSIZE); memcpy(p, filefh, NFS_FHSIZE);
p += (NFS_FHSIZE / 4); p += (NFS_FHSIZE / 4);
len = (uint32_t *)p - (uint32_t *)&(data[0]); len = (uint32_t *)p - (uint32_t *)&(data[0]);
rpc_req (PROG_NFS, NFS_READLINK, data, len); rpc_req(PROG_NFS, NFS_READLINK, data, len);
} }
/************************************************************************** /**************************************************************************
NFS_LOOKUP - Lookup Pathname NFS_LOOKUP - Lookup Pathname
**************************************************************************/ **************************************************************************/
static void static void
nfs_lookup_req (char *fname) nfs_lookup_req(char *fname)
{ {
uint32_t data[1024]; uint32_t data[1024];
uint32_t *p; uint32_t *p;
int len; int len;
int fnamelen; int fnamelen;
fnamelen = strlen (fname); fnamelen = strlen(fname);
p = &(data[0]); p = &(data[0]);
p = (uint32_t *)rpc_add_credentials ((long *)p); p = (uint32_t *)rpc_add_credentials((long *)p);
memcpy (p, dirfh, NFS_FHSIZE); memcpy(p, dirfh, NFS_FHSIZE);
p += (NFS_FHSIZE / 4); p += (NFS_FHSIZE / 4);
*p++ = htonl(fnamelen); *p++ = htonl(fnamelen);
if (fnamelen & 3) *(p + fnamelen / 4) = 0; if (fnamelen & 3)
memcpy (p, fname, fnamelen); *(p + fnamelen / 4) = 0;
memcpy(p, fname, fnamelen);
p += (fnamelen + 3) / 4; p += (fnamelen + 3) / 4;
len = (uint32_t *)p - (uint32_t *)&(data[0]); len = (uint32_t *)p - (uint32_t *)&(data[0]);
rpc_req (PROG_NFS, NFS_LOOKUP, data, len); rpc_req(PROG_NFS, NFS_LOOKUP, data, len);
} }
/************************************************************************** /**************************************************************************
NFS_READ - Read File on NFS Server NFS_READ - Read File on NFS Server
**************************************************************************/ **************************************************************************/
static void static void
nfs_read_req (int offset, int readlen) nfs_read_req(int offset, int readlen)
{ {
uint32_t data[1024]; uint32_t data[1024];
uint32_t *p; uint32_t *p;
int len; int len;
p = &(data[0]); p = &(data[0]);
p = (uint32_t *)rpc_add_credentials ((long *)p); p = (uint32_t *)rpc_add_credentials((long *)p);
memcpy (p, filefh, NFS_FHSIZE); memcpy(p, filefh, NFS_FHSIZE);
p += (NFS_FHSIZE / 4); p += (NFS_FHSIZE / 4);
*p++ = htonl(offset); *p++ = htonl(offset);
*p++ = htonl(readlen); *p++ = htonl(readlen);
@ -343,7 +345,7 @@ nfs_read_req (int offset, int readlen)
len = (uint32_t *)p - (uint32_t *)&(data[0]); len = (uint32_t *)p - (uint32_t *)&(data[0]);
rpc_req (PROG_NFS, NFS_READ, data, len); rpc_req(PROG_NFS, NFS_READ, data, len);
} }
/************************************************************************** /**************************************************************************
@ -351,31 +353,31 @@ RPC request dispatcher
**************************************************************************/ **************************************************************************/
static void static void
NfsSend (void) NfsSend(void)
{ {
debug("%s\n", __func__); debug("%s\n", __func__);
switch (NfsState) { switch (NfsState) {
case STATE_PRCLOOKUP_PROG_MOUNT_REQ: case STATE_PRCLOOKUP_PROG_MOUNT_REQ:
rpc_lookup_req (PROG_MOUNT, 1); rpc_lookup_req(PROG_MOUNT, 1);
break; break;
case STATE_PRCLOOKUP_PROG_NFS_REQ: case STATE_PRCLOOKUP_PROG_NFS_REQ:
rpc_lookup_req (PROG_NFS, 2); rpc_lookup_req(PROG_NFS, 2);
break; break;
case STATE_MOUNT_REQ: case STATE_MOUNT_REQ:
nfs_mount_req (nfs_path); nfs_mount_req(nfs_path);
break; break;
case STATE_UMOUNT_REQ: case STATE_UMOUNT_REQ:
nfs_umountall_req (); nfs_umountall_req();
break; break;
case STATE_LOOKUP_REQ: case STATE_LOOKUP_REQ:
nfs_lookup_req (nfs_filename); nfs_lookup_req(nfs_filename);
break; break;
case STATE_READ_REQ: case STATE_READ_REQ:
nfs_read_req (nfs_offset, nfs_len); nfs_read_req(nfs_offset, nfs_len);
break; break;
case STATE_READLINK_REQ: case STATE_READLINK_REQ:
nfs_readlink_req (); nfs_readlink_req();
break; break;
} }
} }
@ -385,11 +387,11 @@ Handlers for the reply from server
**************************************************************************/ **************************************************************************/
static int static int
rpc_lookup_reply (int prog, uchar *pkt, unsigned len) rpc_lookup_reply(int prog, uchar *pkt, unsigned len)
{ {
struct rpc_t rpc_pkt; struct rpc_t rpc_pkt;
memcpy ((unsigned char *)&rpc_pkt, pkt, len); memcpy((unsigned char *)&rpc_pkt, pkt, len);
debug("%s\n", __func__); debug("%s\n", __func__);
@ -398,9 +400,8 @@ rpc_lookup_reply (int prog, uchar *pkt, unsigned len)
if (rpc_pkt.u.reply.rstatus || if (rpc_pkt.u.reply.rstatus ||
rpc_pkt.u.reply.verifier || rpc_pkt.u.reply.verifier ||
rpc_pkt.u.reply.astatus) { rpc_pkt.u.reply.astatus)
return -1; return -1;
}
switch (prog) { switch (prog) {
case PROG_MOUNT: case PROG_MOUNT:
@ -415,13 +416,13 @@ rpc_lookup_reply (int prog, uchar *pkt, unsigned len)
} }
static int static int
nfs_mount_reply (uchar *pkt, unsigned len) nfs_mount_reply(uchar *pkt, unsigned len)
{ {
struct rpc_t rpc_pkt; struct rpc_t rpc_pkt;
debug("%s\n", __func__); debug("%s\n", __func__);
memcpy ((unsigned char *)&rpc_pkt, pkt, len); memcpy((unsigned char *)&rpc_pkt, pkt, len);
if (ntohl(rpc_pkt.u.reply.id) != rpc_id) if (ntohl(rpc_pkt.u.reply.id) != rpc_id)
return -1; return -1;
@ -429,48 +430,46 @@ nfs_mount_reply (uchar *pkt, unsigned len)
if (rpc_pkt.u.reply.rstatus || if (rpc_pkt.u.reply.rstatus ||
rpc_pkt.u.reply.verifier || rpc_pkt.u.reply.verifier ||
rpc_pkt.u.reply.astatus || rpc_pkt.u.reply.astatus ||
rpc_pkt.u.reply.data[0]) { rpc_pkt.u.reply.data[0])
return -1; return -1;
}
fs_mounted = 1; fs_mounted = 1;
memcpy (dirfh, rpc_pkt.u.reply.data + 1, NFS_FHSIZE); memcpy(dirfh, rpc_pkt.u.reply.data + 1, NFS_FHSIZE);
return 0; return 0;
} }
static int static int
nfs_umountall_reply (uchar *pkt, unsigned len) nfs_umountall_reply(uchar *pkt, unsigned len)
{ {
struct rpc_t rpc_pkt; struct rpc_t rpc_pkt;
debug("%s\n", __func__); debug("%s\n", __func__);
memcpy ((unsigned char *)&rpc_pkt, pkt, len); memcpy((unsigned char *)&rpc_pkt, pkt, len);
if (ntohl(rpc_pkt.u.reply.id) != rpc_id) if (ntohl(rpc_pkt.u.reply.id) != rpc_id)
return -1; return -1;
if (rpc_pkt.u.reply.rstatus || if (rpc_pkt.u.reply.rstatus ||
rpc_pkt.u.reply.verifier || rpc_pkt.u.reply.verifier ||
rpc_pkt.u.reply.astatus) { rpc_pkt.u.reply.astatus)
return -1; return -1;
}
fs_mounted = 0; fs_mounted = 0;
memset (dirfh, 0, sizeof(dirfh)); memset(dirfh, 0, sizeof(dirfh));
return 0; return 0;
} }
static int static int
nfs_lookup_reply (uchar *pkt, unsigned len) nfs_lookup_reply(uchar *pkt, unsigned len)
{ {
struct rpc_t rpc_pkt; struct rpc_t rpc_pkt;
debug("%s\n", __func__); debug("%s\n", __func__);
memcpy ((unsigned char *)&rpc_pkt, pkt, len); memcpy((unsigned char *)&rpc_pkt, pkt, len);
if (ntohl(rpc_pkt.u.reply.id) != rpc_id) if (ntohl(rpc_pkt.u.reply.id) != rpc_id)
return -1; return -1;
@ -478,24 +477,23 @@ nfs_lookup_reply (uchar *pkt, unsigned len)
if (rpc_pkt.u.reply.rstatus || if (rpc_pkt.u.reply.rstatus ||
rpc_pkt.u.reply.verifier || rpc_pkt.u.reply.verifier ||
rpc_pkt.u.reply.astatus || rpc_pkt.u.reply.astatus ||
rpc_pkt.u.reply.data[0]) { rpc_pkt.u.reply.data[0])
return -1; return -1;
}
memcpy (filefh, rpc_pkt.u.reply.data + 1, NFS_FHSIZE); memcpy(filefh, rpc_pkt.u.reply.data + 1, NFS_FHSIZE);
return 0; return 0;
} }
static int static int
nfs_readlink_reply (uchar *pkt, unsigned len) nfs_readlink_reply(uchar *pkt, unsigned len)
{ {
struct rpc_t rpc_pkt; struct rpc_t rpc_pkt;
int rlen; int rlen;
debug("%s\n", __func__); debug("%s\n", __func__);
memcpy ((unsigned char *)&rpc_pkt, pkt, len); memcpy((unsigned char *)&rpc_pkt, pkt, len);
if (ntohl(rpc_pkt.u.reply.id) != rpc_id) if (ntohl(rpc_pkt.u.reply.id) != rpc_id)
return -1; return -1;
@ -503,34 +501,34 @@ nfs_readlink_reply (uchar *pkt, unsigned len)
if (rpc_pkt.u.reply.rstatus || if (rpc_pkt.u.reply.rstatus ||
rpc_pkt.u.reply.verifier || rpc_pkt.u.reply.verifier ||
rpc_pkt.u.reply.astatus || rpc_pkt.u.reply.astatus ||
rpc_pkt.u.reply.data[0]) { rpc_pkt.u.reply.data[0])
return -1; return -1;
}
rlen = ntohl (rpc_pkt.u.reply.data[1]); /* new path length */ rlen = ntohl(rpc_pkt.u.reply.data[1]); /* new path length */
if (*((char *)&(rpc_pkt.u.reply.data[2])) != '/') { if (*((char *)&(rpc_pkt.u.reply.data[2])) != '/') {
int pathlen; int pathlen;
strcat (nfs_path, "/"); strcat(nfs_path, "/");
pathlen = strlen(nfs_path); pathlen = strlen(nfs_path);
memcpy (nfs_path+pathlen, (uchar *)&(rpc_pkt.u.reply.data[2]), rlen); memcpy(nfs_path + pathlen, (uchar *)&(rpc_pkt.u.reply.data[2]),
rlen);
nfs_path[pathlen + rlen] = 0; nfs_path[pathlen + rlen] = 0;
} else { } else {
memcpy (nfs_path, (uchar *)&(rpc_pkt.u.reply.data[2]), rlen); memcpy(nfs_path, (uchar *)&(rpc_pkt.u.reply.data[2]), rlen);
nfs_path[rlen] = 0; nfs_path[rlen] = 0;
} }
return 0; return 0;
} }
static int static int
nfs_read_reply (uchar *pkt, unsigned len) nfs_read_reply(uchar *pkt, unsigned len)
{ {
struct rpc_t rpc_pkt; struct rpc_t rpc_pkt;
int rlen; int rlen;
debug("%s\n", __func__); debug("%s\n", __func__);
memcpy ((uchar *)&rpc_pkt, pkt, sizeof(rpc_pkt.u.reply)); memcpy((uchar *)&rpc_pkt, pkt, sizeof(rpc_pkt.u.reply));
if (ntohl(rpc_pkt.u.reply.id) != rpc_id) if (ntohl(rpc_pkt.u.reply.id) != rpc_id)
return -1; return -1;
@ -539,24 +537,22 @@ nfs_read_reply (uchar *pkt, unsigned len)
rpc_pkt.u.reply.verifier || rpc_pkt.u.reply.verifier ||
rpc_pkt.u.reply.astatus || rpc_pkt.u.reply.astatus ||
rpc_pkt.u.reply.data[0]) { rpc_pkt.u.reply.data[0]) {
if (rpc_pkt.u.reply.rstatus) { if (rpc_pkt.u.reply.rstatus)
return -9999; return -9999;
} if (rpc_pkt.u.reply.astatus)
if (rpc_pkt.u.reply.astatus) {
return -9999; return -9999;
} return -ntohl(rpc_pkt.u.reply.data[0]);
return -ntohl(rpc_pkt.u.reply.data[0]);;
} }
if ((nfs_offset!=0) && !((nfs_offset) % (NFS_READ_SIZE/2*10*HASHES_PER_LINE))) { if ((nfs_offset != 0) && !((nfs_offset) %
puts ("\n\t "); (NFS_READ_SIZE / 2 * 10 * HASHES_PER_LINE)))
} puts("\n\t ");
if (!(nfs_offset % ((NFS_READ_SIZE/2)*10))) { if (!(nfs_offset % ((NFS_READ_SIZE / 2) * 10)))
putc ('#'); putc('#');
}
rlen = ntohl(rpc_pkt.u.reply.data[18]); rlen = ntohl(rpc_pkt.u.reply.data[18]);
if ( store_block ((uchar *)pkt+sizeof(rpc_pkt.u.reply), nfs_offset, rlen) ) if (store_block((uchar *)pkt + sizeof(rpc_pkt.u.reply),
nfs_offset, rlen))
return -9999; return -9999;
return rlen; return rlen;
@ -567,15 +563,15 @@ Interfaces of U-BOOT
**************************************************************************/ **************************************************************************/
static void static void
NfsTimeout (void) NfsTimeout(void)
{ {
if ( ++NfsTimeoutCount > NFS_RETRY_COUNT ) { if (++NfsTimeoutCount > NFS_RETRY_COUNT) {
puts ("\nRetry count exceeded; starting again\n"); puts("\nRetry count exceeded; starting again\n");
NetStartAgain (); NetStartAgain();
} else { } else {
puts("T "); puts("T ");
NetSetTimeout (NFS_TIMEOUT, NfsTimeout); NetSetTimeout(NFS_TIMEOUT, NfsTimeout);
NfsSend (); NfsSend();
} }
} }
@ -586,86 +582,87 @@ NfsHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, unsigned len)
debug("%s\n", __func__); debug("%s\n", __func__);
if (dest != NfsOurPort) return; if (dest != NfsOurPort)
return;
switch (NfsState) { switch (NfsState) {
case STATE_PRCLOOKUP_PROG_MOUNT_REQ: case STATE_PRCLOOKUP_PROG_MOUNT_REQ:
rpc_lookup_reply (PROG_MOUNT, pkt, len); rpc_lookup_reply(PROG_MOUNT, pkt, len);
NfsState = STATE_PRCLOOKUP_PROG_NFS_REQ; NfsState = STATE_PRCLOOKUP_PROG_NFS_REQ;
NfsSend (); NfsSend();
break; break;
case STATE_PRCLOOKUP_PROG_NFS_REQ: case STATE_PRCLOOKUP_PROG_NFS_REQ:
rpc_lookup_reply (PROG_NFS, pkt, len); rpc_lookup_reply(PROG_NFS, pkt, len);
NfsState = STATE_MOUNT_REQ; NfsState = STATE_MOUNT_REQ;
NfsSend (); NfsSend();
break; break;
case STATE_MOUNT_REQ: case STATE_MOUNT_REQ:
if (nfs_mount_reply(pkt, len)) { if (nfs_mount_reply(pkt, len)) {
puts ("*** ERROR: Cannot mount\n"); puts("*** ERROR: Cannot mount\n");
/* just to be sure... */ /* just to be sure... */
NfsState = STATE_UMOUNT_REQ; NfsState = STATE_UMOUNT_REQ;
NfsSend (); NfsSend();
} else { } else {
NfsState = STATE_LOOKUP_REQ; NfsState = STATE_LOOKUP_REQ;
NfsSend (); NfsSend();
} }
break; break;
case STATE_UMOUNT_REQ: case STATE_UMOUNT_REQ:
if (nfs_umountall_reply(pkt, len)) { if (nfs_umountall_reply(pkt, len)) {
puts ("*** ERROR: Cannot umount\n"); puts("*** ERROR: Cannot umount\n");
NetState = NETLOOP_FAIL; NetState = NETLOOP_FAIL;
} else { } else {
puts ("\ndone\n"); puts("\ndone\n");
NetState = NfsDownloadState; NetState = NfsDownloadState;
} }
break; break;
case STATE_LOOKUP_REQ: case STATE_LOOKUP_REQ:
if (nfs_lookup_reply(pkt, len)) { if (nfs_lookup_reply(pkt, len)) {
puts ("*** ERROR: File lookup fail\n"); puts("*** ERROR: File lookup fail\n");
NfsState = STATE_UMOUNT_REQ; NfsState = STATE_UMOUNT_REQ;
NfsSend (); NfsSend();
} else { } else {
NfsState = STATE_READ_REQ; NfsState = STATE_READ_REQ;
nfs_offset = 0; nfs_offset = 0;
nfs_len = NFS_READ_SIZE; nfs_len = NFS_READ_SIZE;
NfsSend (); NfsSend();
} }
break; break;
case STATE_READLINK_REQ: case STATE_READLINK_REQ:
if (nfs_readlink_reply(pkt, len)) { if (nfs_readlink_reply(pkt, len)) {
puts ("*** ERROR: Symlink fail\n"); puts("*** ERROR: Symlink fail\n");
NfsState = STATE_UMOUNT_REQ; NfsState = STATE_UMOUNT_REQ;
NfsSend (); NfsSend();
} else { } else {
debug("Symlink --> %s\n", nfs_path); debug("Symlink --> %s\n", nfs_path);
nfs_filename = basename (nfs_path); nfs_filename = basename(nfs_path);
nfs_path = dirname (nfs_path); nfs_path = dirname(nfs_path);
NfsState = STATE_MOUNT_REQ; NfsState = STATE_MOUNT_REQ;
NfsSend (); NfsSend();
} }
break; break;
case STATE_READ_REQ: case STATE_READ_REQ:
rlen = nfs_read_reply (pkt, len); rlen = nfs_read_reply(pkt, len);
NetSetTimeout (NFS_TIMEOUT, NfsTimeout); NetSetTimeout(NFS_TIMEOUT, NfsTimeout);
if (rlen > 0) { if (rlen > 0) {
nfs_offset += rlen; nfs_offset += rlen;
NfsSend (); NfsSend();
} } else if ((rlen == -NFSERR_ISDIR) || (rlen == -NFSERR_INVAL)) {
else if ((rlen == -NFSERR_ISDIR)||(rlen == -NFSERR_INVAL)) {
/* symbolic link */ /* symbolic link */
NfsState = STATE_READLINK_REQ; NfsState = STATE_READLINK_REQ;
NfsSend (); NfsSend();
} else { } else {
if ( ! rlen ) NfsDownloadState = NETLOOP_SUCCESS; if (!rlen)
NfsDownloadState = NETLOOP_SUCCESS;
NfsState = STATE_UMOUNT_REQ; NfsState = STATE_UMOUNT_REQ;
NfsSend (); NfsSend();
} }
break; break;
} }
@ -673,7 +670,7 @@ NfsHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, unsigned len)
void void
NfsStart (void) NfsStart(void)
{ {
debug("%s\n", __func__); debug("%s\n", __func__);
NfsDownloadState = NETLOOP_FAIL; NfsDownloadState = NETLOOP_FAIL;
@ -683,7 +680,7 @@ NfsStart (void)
if (nfs_path == NULL) { if (nfs_path == NULL) {
NetState = NETLOOP_FAIL; NetState = NETLOOP_FAIL;
puts ("*** ERROR: Fail allocate memory\n"); puts("*** ERROR: Fail allocate memory\n");
return; return;
} }
@ -692,29 +689,29 @@ NfsStart (void)
NetOurIP & 0xFF, NetOurIP & 0xFF,
(NetOurIP >> 8) & 0xFF, (NetOurIP >> 8) & 0xFF,
(NetOurIP >> 16) & 0xFF, (NetOurIP >> 16) & 0xFF,
(NetOurIP >> 24) & 0xFF ); (NetOurIP >> 24) & 0xFF);
strcpy (nfs_path, default_filename); strcpy(nfs_path, default_filename);
printf ("*** Warning: no boot file name; using '%s'\n", printf("*** Warning: no boot file name; using '%s'\n",
nfs_path); nfs_path);
} else { } else {
char *p=BootFile; char *p = BootFile;
p = strchr (p, ':'); p = strchr(p, ':');
if (p != NULL) { if (p != NULL) {
NfsServerIP = string_to_ip (BootFile); NfsServerIP = string_to_ip(BootFile);
++p; ++p;
strcpy (nfs_path, p); strcpy(nfs_path, p);
} else { } else {
strcpy (nfs_path, BootFile); strcpy(nfs_path, BootFile);
} }
} }
nfs_filename = basename (nfs_path); nfs_filename = basename(nfs_path);
nfs_path = dirname (nfs_path); nfs_path = dirname(nfs_path);
printf ("Using %s device\n", eth_get_name()); printf("Using %s device\n", eth_get_name());
printf("File transfer via NFS from server %pI4" printf("File transfer via NFS from server %pI4"
"; our IP address is %pI4", &NfsServerIP, &NetOurIP); "; our IP address is %pI4", &NfsServerIP, &NetOurIP);
@ -725,19 +722,20 @@ NfsStart (void)
IPaddr_t ServerNet = NetServerIP & NetOurSubnetMask; IPaddr_t ServerNet = NetServerIP & NetOurSubnetMask;
if (OurNet != ServerNet) if (OurNet != ServerNet)
printf("; sending through gateway %pI4", &NetOurGatewayIP); printf("; sending through gateway %pI4",
&NetOurGatewayIP);
} }
printf ("\nFilename '%s/%s'.", nfs_path, nfs_filename); printf("\nFilename '%s/%s'.", nfs_path, nfs_filename);
if (NetBootFileSize) { if (NetBootFileSize) {
printf (" Size is 0x%x Bytes = ", NetBootFileSize<<9); printf(" Size is 0x%x Bytes = ", NetBootFileSize<<9);
print_size (NetBootFileSize<<9, ""); print_size(NetBootFileSize<<9, "");
} }
printf ("\nLoad address: 0x%lx\n" printf("\nLoad address: 0x%lx\n"
"Loading: *\b", load_addr); "Loading: *\b", load_addr);
NetSetTimeout (NFS_TIMEOUT, NfsTimeout); NetSetTimeout(NFS_TIMEOUT, NfsTimeout);
NetSetHandler (NfsHandler); NetSetHandler(NfsHandler);
NfsTimeoutCount = 0; NfsTimeoutCount = 0;
NfsState = STATE_PRCLOOKUP_PROG_MOUNT_REQ; NfsState = STATE_PRCLOOKUP_PROG_MOUNT_REQ;
@ -747,7 +745,7 @@ NfsStart (void)
NfsOurPort = 1000; NfsOurPort = 1000;
/* zero out server ether in case the server ip has changed */ /* zero out server ether in case the server ip has changed */
memset (NetServerEther, 0, 6); memset(NetServerEther, 0, 6);
NfsSend (); NfsSend();
} }

2
net/nfs.h
View File

@ -72,7 +72,7 @@ struct rpc_t {
} reply; } reply;
} u; } u;
}; };
extern void NfsStart (void); /* Begin NFS */ extern void NfsStart(void); /* Begin NFS */
/**********************************************************************/ /**********************************************************************/