Skip to content

Commit d9c8a98

Browse files
committed
Snapshot Mon Jul 6 15:10:24 CDT 2009
1 parent f9e86c4 commit d9c8a98

28 files changed

+277
-152
lines changed

rc/bin/ups

+11-18
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,25 @@
11
#!/bin/rc
2-
3-
# lucent web proxy caches the page; defeat it
4-
rfork n
2+
# ups - look up a UPS tracking number
3+
rfork en
54

65
if(! ~ $#* 1) {
76
echo usage: ups 1ZA41W190338680961 >[1=2]
87
exit usage
98
}
109

11-
rfork e
12-
hget 'http://wwwapps.ups.com/etracking/tracking.cgi?track=Track&InquiryNumber1='^$1^ \
10+
hget 'http://wwwapps.ups.com/WebTracking/processInputRequest?tracknum='^$1^ \
1311
'&TypeOfInquiryNumber=T' >/tmp/ups.1
1412

15-
cat /tmp/ups.1 |
16-
x=`{sed -n 's/^<INPUT TYPE="HIDDEN" NAME="([^"]+)" VALUE="([^"]+)">.*/\1=\2/p' |
17-
tr ' ' ++}
18-
x=$"x
19-
x=`{echo $x | sed 's/ /\&/g'}
20-
x=$"x
21-
x=$x^'&tdts1.x=19&tdts1.y=7'
22-
hget -p $x http://wwwapps.ups.com/etracking/tracking.cgi >/tmp/ups.2
23-
24-
sed 's/<[Tt][Dd]>/& «TD»/g; s/<[Tt][Rr]>/&<td> «TR» /g' /tmp/ups.2 |
25-
htmlfmt >/tmp/ups.3
26-
sam -d /tmp/ups.3 >[2] /dev/null <<'!'
13+
sed 's/<[Tt][Dd]>/& «TD»/g; s/<[Tt][Rr]>/&<td> «TR» /g' /tmp/ups.1 |
14+
htmlfmt >/tmp/ups.2
15+
sam -d /tmp/ups.2 >[2] /dev/null <<'!'
2716
/^Tracking results.*/p
2817
.,$d
29-
/View Details/d
18+
/Help/d
3019
1,.d
20+
$-2,$d
21+
/Status:/+1
22+
.,/«TR»/-2d
3123
,s/\n/ /g
3224
,s/«TR»/\n/g
3325
,s/«TD»/ /g
@@ -37,3 +29,4 @@ sam -d /tmp/ups.3 >[2] /dev/null <<'!'
3729
,s/\n\n+/\n\n/g
3830
,p
3931
!
32+
echo

sys/man/1/INDEX

+1
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ look look
177177
lp lp
178178
lc ls
179179
ls ls
180+
go.fishing mail
180181
mail mail
181182
lookman man
182183
man man

sys/man/1/INDEX.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ <H2>Plan 9 from Bell Labs - Section 1 - Commands</H2>
316316
</DT>
317317
<DT><A HREF="/magic/man2html/1/mail">mail</A>
318318
- mail and mailboxes
319-
<DD><TT> mail</TT>
319+
<DD><TT> mail, go.fishing</TT>
320320
</DT>
321321
<DT><A HREF="/magic/man2html/1/man">man</A>
322322
- print or find pages of this manual

sys/man/2/INDEX

+26
Original file line numberDiff line numberDiff line change
@@ -1329,6 +1329,32 @@ nsec time
13291329
time time
13301330
tmpfile tmpfile
13311331
tmpnam tmpfile
1332+
CSP usb
1333+
class usb
1334+
classname usb
1335+
closedev usb
1336+
configdev usb
1337+
devctl usb
1338+
finddevs usb
1339+
loaddevstr usb
1340+
matchdevcsp usb
1341+
opendev usb
1342+
opendevdata usb
1343+
openep usb
1344+
proto usb
1345+
startdevs usb
1346+
subclass usb
1347+
unstall usb
1348+
usb usb
1349+
usbcmd usb
1350+
usbdirfs usbfs
1351+
usbdirread usbfs
1352+
usbfs usbfs
1353+
usbfsadd usbfs
1354+
usbfsdel usbfs
1355+
usbfsinit usbfs
1356+
usbreadbuf usbfs
1357+
venti venti
13321358
VtBlock venti-cache
13331359
VtCache venti-cache
13341360
venti-cache venti-cache

sys/man/2/INDEX.html

+12
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,18 @@ <H2>Plan 9 from Bell Labs - Section 2 - System and Library Calls</H2>
574574
- Stdio temporary files
575575
<DD><TT> tmpfile, tmpnam</TT>
576576
</DT>
577+
<DT><A HREF="/magic/man2html/2/usb">usb</A>
578+
- USB device driver library
579+
<DD><TT> usbcmd, classname, closedev, configdev, devctl, finddevs, loaddevstr, matchdevcsp, opendev, opendevdata, openep, startdevs, unstall, class, subclass, proto, CSP</TT>
580+
</DT>
581+
<DT><A HREF="/magic/man2html/2/usbfs">usbfs</A>
582+
- USB device driver file system library
583+
<DD><TT> usbreadbuf, usbfsadd, usbfsdel, usbdirread, usbfsinit, usbdirfs, usbfs</TT>
584+
</DT>
585+
<DT><A HREF="/magic/man2html/2/venti">venti</A>
586+
- archival storage server
587+
<DD><TT> venti</TT>
588+
</DT>
577589
<DT><A HREF="/magic/man2html/2/venti-cache">venti-cache</A>
578590
- Venti block cache
579591
<DD><TT> VtBlock, VtCache, vtblockcopy, vtblockdirty, vtblockduplock, vtblockput, vtblockwrite, vtcachealloc, vtcacheallocblock, vtcacheblocksize, vtcachefree, vtcacheglobal, vtcachelocal, vtcachesetwrite, vtglobaltolocal, vtlocaltoglobal</TT>

sys/man/2/venti

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
.TH VENTI 2
2+
.SH NAME
3+
venti \- archival storage server
4+
.SH SYNOPSIS
5+
.ft L
6+
#include <u.h>
7+
.br
8+
#include <libc.h>
9+
.br
10+
#include <venti.h>
11+
.SH DESCRIPTION
12+
The Venti library provides support for writing Venti servers and clients.
13+
Other manual pages describe the library functions in detail.
14+
.PP
15+
.IR Venti-cache (2)
16+
describes a simple in-memory block cache to help clients.
17+
.PP
18+
.IR Venti-conn (2)
19+
describes routines for manipulating network connections
20+
between Venti clients and servers.
21+
.IR Venti-client (2)
22+
and
23+
.IR venti-server (2)
24+
describe routines for writing clients
25+
and servers on top of these.
26+
.PP
27+
.IR Venti-fcall (2)
28+
describes the C representation of Venti protocol messages
29+
and data structures.
30+
It also describes routines that convert between the C representation
31+
and the network and disk representations.
32+
.PP
33+
.IR Venti-file (2)
34+
describes routines for writing clients that manipulate
35+
Venti file trees
36+
(see
37+
.IR venti (6)).
38+
.PP
39+
.IR Venti-log (2)
40+
describes routines to access in-memory log buffers
41+
as well as the logging that is done automatically by
42+
the library.
43+
.PP
44+
.IR Venti-mem (2)
45+
describes wrappers around the canonical
46+
.IR malloc (2)
47+
routines that abort on error.
48+
.PP
49+
.IR Venti-packet (2)
50+
describes routines for
51+
manipulating zero-copy chains of
52+
data buffers.
53+
.PP
54+
.IR Venti-zero (2)
55+
describes routines to zero truncate and zero extend blocks
56+
(see
57+
.IR venti (6)).
58+
.SH SOURCE
59+
.B /sys/src/libventi
60+
.SH SEE ALSO
61+
.IR venti (1),
62+
.IR venti-cache (2),
63+
.IR venti-client (2),
64+
.IR venti-fcall (2),
65+
.IR venti-file (2)
66+
.IR venti-log (2),
67+
.IR venti-mem (2),
68+
.IR venti-packet (2),
69+
.IR venti-server (2),
70+
.IR venti-zero (2),
71+
.IR venti (6),
72+
.IR venti (8)

sys/man/4/INDEX

+6-4
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,16 @@ telcodata telco
6868
telcofax telco
6969
u9fs u9fs
7070
upasfs upasfs
71+
audio usb
72+
disk usb
73+
ether usb
7174
kb usb
7275
print usb
76+
probe usb
77+
serial usb
7378
usb usb
74-
usbaudio usb
75-
usbmouse usb
79+
usbfat: usb
7680
usbd usbd
77-
usbdisk usbdisk
78-
usbfat: usbdisk
7981
vacfs vacfs
8082
webcookies webcookies
8183
webfs webfs

sys/man/4/INDEX.html

+2-6
Original file line numberDiff line numberDiff line change
@@ -159,17 +159,13 @@ <H2>Plan 9 from Bell Labs - Section 4 - File Servers</H2>
159159
<DD><TT> upasfs</TT>
160160
</DT>
161161
<DT><A HREF="/magic/man2html/4/usb">usb</A>
162-
- Universal Serial Bus user-level device drivers
163-
<DD><TT> usbmouse, kb, usbaudio, print</TT>
162+
- Universal Serial Bus device drivers
163+
<DD><TT> audio, disk, ether, kb, print, probe, serial, usbfat:</TT>
164164
</DT>
165165
<DT><A HREF="/magic/man2html/4/usbd">usbd</A>
166166
- Universal Serial Bus daemon
167167
<DD><TT> usbd</TT>
168168
</DT>
169-
<DT><A HREF="/magic/man2html/4/usbdisk">usbdisk</A>
170-
- serve USB mass storage devices
171-
<DD><TT> usbdisk, usbfat:</TT>
172-
</DT>
173169
<DT><A HREF="/magic/man2html/4/vacfs">vacfs</A>
174170
- a Venti-based file system
175171
<DD><TT> vacfs</TT>

sys/man/searchindex

+14-12
Large diffs are not rendered by default.

sys/man/vol1.pdf

505 KB
Binary file not shown.

sys/man/vol1.ps

2.29 MB
Binary file not shown.

sys/man/vol1.ps.gz

710 KB
Binary file not shown.

sys/src/9/boot/boot.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ usbinit(void)
326326
{
327327
static char *darg[] = { "/boot/usbd", nil };
328328

329-
if(bind("#u", "/dev", MAFTER) >= 0 && access("/dev/usb", 0) >= 0)
329+
if(access("#u/usb/ctl", 0) >= 0 && bind("#u", "/dev", MAFTER) >= 0)
330330
run("usbd", darg);
331331
}
332332

sys/src/9/pc/ether79c970.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -540,9 +540,10 @@ reset(Ether* ether)
540540
switch(x&0xFFFFFFF){
541541
case 0x2420003: /* PCnet/PCI 79C970 */
542542
case 0x2621003: /* PCnet/PCI II 79C970A */
543+
case 0x2625003: /* PCnet-FAST III 79C973 */
543544
break;
544545
default:
545-
print("#l%d: unknown PCnet card version %.7ux\n",
546+
print("#l%d: unknown PCnet card version 0x%.7ux\n",
546547
ether->ctlrno, x&0xFFFFFFF);
547548
iunlock(ctlr);
548549
return -1;

sys/src/9/pc/etherigbe.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1948,7 +1948,7 @@ igbepci(void)
19481948
break;
19491949
case 0x00:
19501950
case 0xFF:
1951-
print("igbe: unusable CLS\n");
1951+
print("igbe: unusable CLS - %d\n", cls*4);
19521952
continue;
19531953
case 0x08:
19541954
case 0x10:

sys/src/9/pc/usbehci.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ enum
7575

7676
/* Debug port csw reg. */
7777
Cowner = 0x40000000, /* port owned by ehci */
78-
Cenable = 0x20000000, /* debug port enabled */
78+
Cenable = 0x10000000, /* debug port enabled */
7979
Cdone = 0x00010000, /* request is done */
8080
Cbusy = 0x00000400, /* port in use by a driver */
8181
Cerrmask= 0x00000380, /* error code bits */
@@ -95,7 +95,7 @@ enum
9595
Ptokmask = 0xFF,
9696

9797
Ptoggle = 0x00008800, /* to update toggles */
98-
Ptogglemask = 0x00FFFF00,
98+
Ptogglemask = 0x0000FF00,
9999

100100
/* Debug port addr reg. */
101101
Adevshift = 8, /* device address */
@@ -143,3 +143,5 @@ struct Edbgio
143143
ulong addr; /* device and endpoint addresses */
144144
};
145145

146+
extern Ecapio *ehcidebugcapio;
147+
extern int ehcidebugport;

0 commit comments

Comments
 (0)