diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2012-04-25 15:31:55 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-04-25 15:31:55 -0700 |
| commit | 8771de3c3623785447014213007418573e652fd3 (patch) | |
| tree | 6d25a684685240aff96d4034c96803d282158450 | |
| parent | 86a2df0467466d3e197837964db38b312b89ac0b (diff) | |
| parent | bd71f69ea0aa1e50f4bd4accc9f63be6f0d69cbb (diff) | |
| download | syslinux-8771de3c3623785447014213007418573e652fd3.tar.gz | |
Merge remote-tracking branch 'genec/com32-cptime-upd-for-hpa' into lwip
| -rw-r--r-- | com32/modules/Makefile | 3 | ||||
| -rw-r--r-- | com32/modules/cptime.c (renamed from com32/samples/cptime.c) | 0 | ||||
| -rw-r--r-- | com32/modules/prdhcp.c | 5 | ||||
| -rw-r--r-- | doc/cptime.txt | 50 |
4 files changed, 55 insertions, 3 deletions
diff --git a/com32/modules/Makefile b/com32/modules/Makefile index 1b2854f5..0d1e8776 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -23,7 +23,8 @@ MODULES = config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 \ disk.c32 pcitest.c32 elf.c32 linux.c32 reboot.c32 pmload.c32 \ meminfo.c32 sdi.c32 sanboot.c32 ifcpu64.c32 vesainfo.c32 \ kbdmap.c32 cmd.c32 vpdtest.c32 host.c32 ls.c32 gpxecmd.c32 \ - ifcpu.c32 cpuid.c32 cat.c32 pwd.c32 ifplop.c32 zzjson.c32 whichsys.c32 + ifcpu.c32 cpuid.c32 cat.c32 pwd.c32 ifplop.c32 zzjson.c32 \ + whichsys.c32 cptime.c32 prdhcp.c32 TESTFILES = diff --git a/com32/samples/cptime.c b/com32/modules/cptime.c index 0f5ffe61..0f5ffe61 100644 --- a/com32/samples/cptime.c +++ b/com32/modules/cptime.c diff --git a/com32/modules/prdhcp.c b/com32/modules/prdhcp.c index 5b572b0b..321d4e77 100644 --- a/com32/modules/prdhcp.c +++ b/com32/modules/prdhcp.c @@ -136,11 +136,12 @@ void print_dhcp_pkt_all(void) pxe_bootp_t *p; size_t len; int i; + int ptype[3] = {PXENV_PACKET_TYPE_DHCP_DISCOVER, PXENV_PACKET_TYPE_DHCP_ACK, PXENV_PACKET_TYPE_CACHED_REPLY}; for (i = 0; i < 3; i++) { - if (!pxe_get_cached_info(PXENV_PACKET_TYPE_CACHED_REPLY, + if (!pxe_get_cached_info(ptype[i], (void **)&(p), &(len))) { - dprintf("Got packet #%d\n", i); + dprintf("Got packet #%d/%d\n", (i + 1), ptype[i]); print_pxe_bootp_t(p, len); pressanykey(); } diff --git a/doc/cptime.txt b/doc/cptime.txt new file mode 100644 index 00000000..982dbf7c --- /dev/null +++ b/doc/cptime.txt @@ -0,0 +1,50 @@ += cptime.c32(1) = +:doctype: manpage +:author: Gene Cumm +:email: gene.cumm@gmail.com +:revdate: 2011-12-17 + + +== NAME == +cptime.c32 - times the copy off (read) of a file + + +== SYNOPSIS == +*cptime.c32* ['OPTIONS'] 'FILE'... + + +== DESCRIPTION == +Times the copy off (read) of a file, optionally computes/displays +transfer rates(on by default) with an adjustable transfer size and +maximum transfer length. + + +== OPTIONS == +*-b* 'SIZE':: + use 'SIZE' for transfer size; defaults to 2048 for COM32 + +*-l*:: + long output mode; default; reverses *-s* + +*-n* 'LEN':: + maximum length to fetch; defaults to whole file + +*-q*:: + quiet (normal/non-verbose) mode; default; reverses *-v* + +*-s*:: + simple output mode + +*-v*:: + verbose mode + +The same mode is used for all files. + + +== AUTHOR == +{author} <{email}> + +== COPYRIGHT == +Copyright \(C) 2011 {author}. Free use of this software is granted under +the terms of the GNU General Public License (GPL). + |