Browse Source

Plan 9 from Bell Labs 2005-01-09

David du Colombier 17 years ago
parent
commit
94a1dbdfcc
5 changed files with 127 additions and 89 deletions
  1. 37 37
      dist/replica/_plan9.db
  2. 37 37
      dist/replica/plan9.db
  3. 37 0
      dist/replica/plan9.log
  4. 4 3
      lib/vgadb
  5. 12 12
      sys/src/9/pc/devusb.c

+ 37 - 37
dist/replica/_plan9.db

@@ -3,13 +3,13 @@
 386/9loaddebug - 775 sys sys 1104122096 306647
 386/9loadlite - 775 sys sys 1100269949 132260
 386/9loadlitedebug - 775 sys sys 1104122096 195560
-386/9pc - 775 sys sys 1104562497 1833527
+386/9pc - 775 sys sys 1105161523 1833601
 386/9pc.gz - 664 sys sys 1077049336 635727
-386/9pccpu - 775 sys sys 1104294673 1488469
+386/9pccpu - 775 sys sys 1105161526 1488543
 386/9pccpu.gz - 664 sys sys 1077049387 519909
-386/9pcdisk - 775 sys sys 1104562501 2038981
+386/9pcdisk - 775 sys sys 1105161530 2039055
 386/9pcdisk.gz - 664 sys sys 1040006345 703136
-386/9pcf - 775 sys sys 1104562506 2381749
+386/9pcf - 775 sys sys 1105161534 2381887
 386/9pcf.gz - 664 sys sys 1077049490 872650
 386/9pxeload - 775 sys sys 1100269949 208708
 386/_9pcdisk.gz - 664 sys sys 1039764191 695837
@@ -450,7 +450,7 @@
 386/bin/upas/runq - 775 sys sys 1104122074 113086
 386/bin/upas/scanmail - 775 sys sys 1104122075 128749
 386/bin/upas/send - 775 sys sys 1104122075 191536
-386/bin/upas/smtp - 775 sys sys 1104122076 272345
+386/bin/upas/smtp - 775 sys sys 1105161519 273654
 386/bin/upas/smtpd - 775 sys sys 1104122077 328677
 386/bin/upas/spam - 775 sys sys 1064598366 36
 386/bin/upas/testscan - 775 sys sys 1104122077 83668
@@ -522,37 +522,37 @@
 386/lib/ape/libregexp.a - 664 sys sys 1089402372 47670
 386/lib/ape/libutf.a - 664 sys sys 1089402372 81266
 386/lib/ape/libv.a - 664 sys sys 1089402372 19668
-386/lib/lib9p.a - 664 sys sys 1104562507 80096
-386/lib/libString.a - 664 sys sys 1104562507 22524
-386/lib/libauth.a - 664 sys sys 1104562507 56970
-386/lib/libauthsrv.a - 664 sys sys 1104562507 33802
-386/lib/libbin.a - 664 sys sys 1104562507 2562
-386/lib/libbio.a - 664 sys sys 1104562508 26346
-386/lib/libc.a - 664 sys sys 1104562509 504420
-386/lib/libcomplete.a - 664 sys sys 1104562509 6438
-386/lib/libcontrol.a - 664 sys sys 1104562510 276966
-386/lib/libdisk.a - 664 sys sys 1104562510 42566
-386/lib/libdraw.a - 664 sys sys 1104562511 376160
-386/lib/libflate.a - 664 sys sys 1104562511 77012
-386/lib/libframe.a - 664 sys sys 1104562511 66624
-386/lib/libgeometry.a - 664 sys sys 1104562511 50810
-386/lib/libhtml.a - 664 sys sys 1104562512 220448
-386/lib/libhttpd.a - 664 sys sys 1104562512 100172
-386/lib/libip.a - 664 sys sys 1104562512 35906
-386/lib/libl.a - 664 sys sys 1104562512 5496
-386/lib/libmach.a - 664 sys sys 1104562513 653962
-386/lib/libmemdraw.a - 664 sys sys 1104562514 284052
-386/lib/libmemlayer.a - 664 sys sys 1104562514 47760
-386/lib/libmp.a - 664 sys sys 1104562514 80364
-386/lib/libndb.a - 664 sys sys 1104562515 61406
-386/lib/libplumb.a - 664 sys sys 1104562515 19064
-386/lib/libregexp.a - 664 sys sys 1104562515 37632
-386/lib/libscribble.a - 664 sys sys 1104562515 107692
-386/lib/libsec.a - 664 sys sys 1104562516 645798
+386/lib/lib9p.a - 664 sys sys 1105161535 79300
+386/lib/libString.a - 664 sys sys 1105161535 22184
+386/lib/libauth.a - 664 sys sys 1105161535 56134
+386/lib/libauthsrv.a - 664 sys sys 1105161535 33522
+386/lib/libbin.a - 664 sys sys 1105161535 2534
+386/lib/libbio.a - 664 sys sys 1105161535 26078
+386/lib/libc.a - 664 sys sys 1105161536 500976
+386/lib/libcomplete.a - 664 sys sys 1105161536 6370
+386/lib/libcontrol.a - 664 sys sys 1105161537 274922
+386/lib/libdisk.a - 664 sys sys 1105161537 42234
+386/lib/libdraw.a - 664 sys sys 1105161538 373544
+386/lib/libflate.a - 664 sys sys 1105161538 76872
+386/lib/libframe.a - 664 sys sys 1105161538 66060
+386/lib/libgeometry.a - 664 sys sys 1105161538 50470
+386/lib/libhtml.a - 664 sys sys 1105161539 219972
+386/lib/libhttpd.a - 664 sys sys 1105161539 99488
+386/lib/libip.a - 664 sys sys 1105161539 35602
+386/lib/libl.a - 664 sys sys 1105161539 5384
+386/lib/libmach.a - 664 sys sys 1105161540 652274
+386/lib/libmemdraw.a - 664 sys sys 1105161541 283188
+386/lib/libmemlayer.a - 664 sys sys 1105161541 47360
+386/lib/libmp.a - 664 sys sys 1105161541 79532
+386/lib/libndb.a - 664 sys sys 1105161541 60666
+386/lib/libplumb.a - 664 sys sys 1105161541 18876
+386/lib/libregexp.a - 664 sys sys 1105161542 37464
+386/lib/libscribble.a - 664 sys sys 1105161542 107280
+386/lib/libsec.a - 664 sys sys 1105161543 643958
 386/lib/libstdio.a - 664 sys sys 1102171828 126382
-386/lib/libsunrpc.a - 664 sys sys 1104562517 357982
-386/lib/libthread.a - 664 sys sys 1104562518 72374
-386/lib/libventi.a - 664 sys sys 1104562518 98856
+386/lib/libsunrpc.a - 664 sys sys 1105161544 355994
+386/lib/libthread.a - 664 sys sys 1105161544 71162
+386/lib/libventi.a - 664 sys sys 1105161545 97708
 386/mbr - 775 sys sys 1022125974 407
 386/mkfile - 664 sys sys 948141303 46
 386/pbs - 775 sys sys 1022125973 494
@@ -2800,7 +2800,7 @@ lib/tftpd - 20000000775 sys sys 944944178 0
 lib/unicode - 664 sys sys 958440028 223312
 lib/unicode.notice - 664 sys sys 958504386 1398
 lib/units - 664 sys sys 1071415518 9997
-lib/vgadb - 664 sys sys 1097607554 28686
+lib/vgadb - 664 sys sys 1105192978 28703
 lib/volcanoes - 664 sys sys 944944024 119831
 lib/words - 664 sys sys 1014923442 247097
 lp - 20000000775 sys sys 958199268 0
@@ -5359,7 +5359,7 @@ sys/src/9/pc/devlpt.c - 664 sys sys 1015014514 4420
 sys/src/9/pc/devpccard.c - 664 sys sys 1089299187 40138
 sys/src/9/pc/devrtc.c - 664 sys sys 1015014515 7167
 sys/src/9/pc/devtv.c - 664 sys sys 1091734484 45725
-sys/src/9/pc/devusb.c - 664 sys sys 1099760881 18371
+sys/src/9/pc/devusb.c - 664 sys sys 1105193103 18364
 sys/src/9/pc/devvga.c - 664 sys sys 1063857412 8714
 sys/src/9/pc/dma.c - 664 sys sys 1015014515 4736
 sys/src/9/pc/errstr.h - 664 sys sys 1075069582 2137

+ 37 - 37
dist/replica/plan9.db

@@ -3,13 +3,13 @@
 386/9loaddebug - 775 sys sys 1104122096 306647
 386/9loadlite - 775 sys sys 1100269949 132260
 386/9loadlitedebug - 775 sys sys 1104122096 195560
-386/9pc - 775 sys sys 1104562497 1833527
+386/9pc - 775 sys sys 1105161523 1833601
 386/9pc.gz - 664 sys sys 1077049336 635727
-386/9pccpu - 775 sys sys 1104294673 1488469
+386/9pccpu - 775 sys sys 1105161526 1488543
 386/9pccpu.gz - 664 sys sys 1077049387 519909
-386/9pcdisk - 775 sys sys 1104562501 2038981
+386/9pcdisk - 775 sys sys 1105161530 2039055
 386/9pcdisk.gz - 664 sys sys 1040006345 703136
-386/9pcf - 775 sys sys 1104562506 2381749
+386/9pcf - 775 sys sys 1105161534 2381887
 386/9pcf.gz - 664 sys sys 1077049490 872650
 386/9pxeload - 775 sys sys 1100269949 208708
 386/_9pcdisk.gz - 664 sys sys 1039764191 695837
@@ -450,7 +450,7 @@
 386/bin/upas/runq - 775 sys sys 1104122074 113086
 386/bin/upas/scanmail - 775 sys sys 1104122075 128749
 386/bin/upas/send - 775 sys sys 1104122075 191536
-386/bin/upas/smtp - 775 sys sys 1104122076 272345
+386/bin/upas/smtp - 775 sys sys 1105161519 273654
 386/bin/upas/smtpd - 775 sys sys 1104122077 328677
 386/bin/upas/spam - 775 sys sys 1064598366 36
 386/bin/upas/testscan - 775 sys sys 1104122077 83668
@@ -522,37 +522,37 @@
 386/lib/ape/libregexp.a - 664 sys sys 1089402372 47670
 386/lib/ape/libutf.a - 664 sys sys 1089402372 81266
 386/lib/ape/libv.a - 664 sys sys 1089402372 19668
-386/lib/lib9p.a - 664 sys sys 1104562507 80096
-386/lib/libString.a - 664 sys sys 1104562507 22524
-386/lib/libauth.a - 664 sys sys 1104562507 56970
-386/lib/libauthsrv.a - 664 sys sys 1104562507 33802
-386/lib/libbin.a - 664 sys sys 1104562507 2562
-386/lib/libbio.a - 664 sys sys 1104562508 26346
-386/lib/libc.a - 664 sys sys 1104562509 504420
-386/lib/libcomplete.a - 664 sys sys 1104562509 6438
-386/lib/libcontrol.a - 664 sys sys 1104562510 276966
-386/lib/libdisk.a - 664 sys sys 1104562510 42566
-386/lib/libdraw.a - 664 sys sys 1104562511 376160
-386/lib/libflate.a - 664 sys sys 1104562511 77012
-386/lib/libframe.a - 664 sys sys 1104562511 66624
-386/lib/libgeometry.a - 664 sys sys 1104562511 50810
-386/lib/libhtml.a - 664 sys sys 1104562512 220448
-386/lib/libhttpd.a - 664 sys sys 1104562512 100172
-386/lib/libip.a - 664 sys sys 1104562512 35906
-386/lib/libl.a - 664 sys sys 1104562512 5496
-386/lib/libmach.a - 664 sys sys 1104562513 653962
-386/lib/libmemdraw.a - 664 sys sys 1104562514 284052
-386/lib/libmemlayer.a - 664 sys sys 1104562514 47760
-386/lib/libmp.a - 664 sys sys 1104562514 80364
-386/lib/libndb.a - 664 sys sys 1104562515 61406
-386/lib/libplumb.a - 664 sys sys 1104562515 19064
-386/lib/libregexp.a - 664 sys sys 1104562515 37632
-386/lib/libscribble.a - 664 sys sys 1104562515 107692
-386/lib/libsec.a - 664 sys sys 1104562516 645798
+386/lib/lib9p.a - 664 sys sys 1105161535 79300
+386/lib/libString.a - 664 sys sys 1105161535 22184
+386/lib/libauth.a - 664 sys sys 1105161535 56134
+386/lib/libauthsrv.a - 664 sys sys 1105161535 33522
+386/lib/libbin.a - 664 sys sys 1105161535 2534
+386/lib/libbio.a - 664 sys sys 1105161535 26078
+386/lib/libc.a - 664 sys sys 1105161536 500976
+386/lib/libcomplete.a - 664 sys sys 1105161536 6370
+386/lib/libcontrol.a - 664 sys sys 1105161537 274922
+386/lib/libdisk.a - 664 sys sys 1105161537 42234
+386/lib/libdraw.a - 664 sys sys 1105161538 373544
+386/lib/libflate.a - 664 sys sys 1105161538 76872
+386/lib/libframe.a - 664 sys sys 1105161538 66060
+386/lib/libgeometry.a - 664 sys sys 1105161538 50470
+386/lib/libhtml.a - 664 sys sys 1105161539 219972
+386/lib/libhttpd.a - 664 sys sys 1105161539 99488
+386/lib/libip.a - 664 sys sys 1105161539 35602
+386/lib/libl.a - 664 sys sys 1105161539 5384
+386/lib/libmach.a - 664 sys sys 1105161540 652274
+386/lib/libmemdraw.a - 664 sys sys 1105161541 283188
+386/lib/libmemlayer.a - 664 sys sys 1105161541 47360
+386/lib/libmp.a - 664 sys sys 1105161541 79532
+386/lib/libndb.a - 664 sys sys 1105161541 60666
+386/lib/libplumb.a - 664 sys sys 1105161541 18876
+386/lib/libregexp.a - 664 sys sys 1105161542 37464
+386/lib/libscribble.a - 664 sys sys 1105161542 107280
+386/lib/libsec.a - 664 sys sys 1105161543 643958
 386/lib/libstdio.a - 664 sys sys 1102171828 126382
-386/lib/libsunrpc.a - 664 sys sys 1104562517 357982
-386/lib/libthread.a - 664 sys sys 1104562518 72374
-386/lib/libventi.a - 664 sys sys 1104562518 98856
+386/lib/libsunrpc.a - 664 sys sys 1105161544 355994
+386/lib/libthread.a - 664 sys sys 1105161544 71162
+386/lib/libventi.a - 664 sys sys 1105161545 97708
 386/mbr - 775 sys sys 1022125974 407
 386/mkfile - 664 sys sys 948141303 46
 386/pbs - 775 sys sys 1022125973 494
@@ -2800,7 +2800,7 @@ lib/tftpd - 20000000775 sys sys 944944178 0
 lib/unicode - 664 sys sys 958440028 223312
 lib/unicode.notice - 664 sys sys 958504386 1398
 lib/units - 664 sys sys 1071415518 9997
-lib/vgadb - 664 sys sys 1097607554 28686
+lib/vgadb - 664 sys sys 1105192978 28703
 lib/volcanoes - 664 sys sys 944944024 119831
 lib/words - 664 sys sys 1014923442 247097
 lp - 20000000775 sys sys 958199268 0
@@ -5359,7 +5359,7 @@ sys/src/9/pc/devlpt.c - 664 sys sys 1015014514 4420
 sys/src/9/pc/devpccard.c - 664 sys sys 1089299187 40138
 sys/src/9/pc/devrtc.c - 664 sys sys 1015014515 7167
 sys/src/9/pc/devtv.c - 664 sys sys 1091734484 45725
-sys/src/9/pc/devusb.c - 664 sys sys 1099760881 18371
+sys/src/9/pc/devusb.c - 664 sys sys 1105193103 18364
 sys/src/9/pc/devvga.c - 664 sys sys 1063857412 8714
 sys/src/9/pc/dma.c - 664 sys sys 1015014515 4736
 sys/src/9/pc/errstr.h - 664 sys sys 1075069582 2137

+ 37 - 0
dist/replica/plan9.log

@@ -18302,3 +18302,40 @@
 1105124578 0 c sys/src/cmd/aux/mkfile - 664 sys sys 1105123164 962
 1105124578 1 a sys/src/cmd/aux/msexceltables.c - 664 sys sys 1105123098 13134
 1105129979 0 c usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
+1105162266 0 c 386/9pc - 775 sys sys 1105161523 1833601
+1105162266 1 c 386/9pccpu - 775 sys sys 1105161526 1488543
+1105162266 2 c 386/9pcdisk - 775 sys sys 1105161530 2039055
+1105162266 3 c 386/9pcf - 775 sys sys 1105161534 2381887
+1105162266 4 c 386/bin/upas/smtp - 775 sys sys 1105161519 273654
+1105162266 5 c 386/lib/lib9p.a - 664 sys sys 1105161535 79300
+1105162266 6 c 386/lib/libString.a - 664 sys sys 1105161535 22184
+1105162266 7 c 386/lib/libauth.a - 664 sys sys 1105161535 56134
+1105162266 8 c 386/lib/libauthsrv.a - 664 sys sys 1105161535 33522
+1105162266 9 c 386/lib/libbin.a - 664 sys sys 1105161535 2534
+1105162266 10 c 386/lib/libbio.a - 664 sys sys 1105161535 26078
+1105162266 11 c 386/lib/libc.a - 664 sys sys 1105161536 500976
+1105162266 12 c 386/lib/libcomplete.a - 664 sys sys 1105161536 6370
+1105162266 13 c 386/lib/libcontrol.a - 664 sys sys 1105161537 274922
+1105162266 14 c 386/lib/libdisk.a - 664 sys sys 1105161537 42234
+1105162266 15 c 386/lib/libdraw.a - 664 sys sys 1105161538 373544
+1105162266 16 c 386/lib/libflate.a - 664 sys sys 1105161538 76872
+1105162266 17 c 386/lib/libframe.a - 664 sys sys 1105161538 66060
+1105162266 18 c 386/lib/libgeometry.a - 664 sys sys 1105161538 50470
+1105162266 19 c 386/lib/libhtml.a - 664 sys sys 1105161539 219972
+1105162266 20 c 386/lib/libhttpd.a - 664 sys sys 1105161539 99488
+1105162266 21 c 386/lib/libip.a - 664 sys sys 1105161539 35602
+1105162266 22 c 386/lib/libl.a - 664 sys sys 1105161539 5384
+1105162266 23 c 386/lib/libmach.a - 664 sys sys 1105161540 652274
+1105162266 24 c 386/lib/libmemdraw.a - 664 sys sys 1105161541 283188
+1105162266 25 c 386/lib/libmemlayer.a - 664 sys sys 1105161541 47360
+1105162266 26 c 386/lib/libmp.a - 664 sys sys 1105161541 79532
+1105162266 27 c 386/lib/libndb.a - 664 sys sys 1105161541 60666
+1105162266 28 c 386/lib/libplumb.a - 664 sys sys 1105161541 18876
+1105162266 29 c 386/lib/libregexp.a - 664 sys sys 1105161542 37464
+1105162266 30 c 386/lib/libscribble.a - 664 sys sys 1105161542 107280
+1105162266 31 c 386/lib/libsec.a - 664 sys sys 1105161543 643958
+1105162266 32 c 386/lib/libsunrpc.a - 664 sys sys 1105161544 355994
+1105162266 33 c 386/lib/libthread.a - 664 sys sys 1105161544 71162
+1105162266 34 c 386/lib/libventi.a - 664 sys sys 1105161545 97708
+1105194679 0 c lib/vgadb - 664 sys sys 1105192978 28703
+1105194679 1 c sys/src/9/pc/devusb.c - 664 sys sys 1105193103 18364

+ 4 - 3
lib/vgadb

@@ -1168,9 +1168,10 @@ planar=1280x1024
 # Samsung 213T
 #
 213t=1600x1200
-	defaultclock=200
-	shb=1664 ehb=1864 ht=2136
-	vrs=1202 vre=1207 vt=1251
+	defaultclock=162
+	shb=1664 ehb=1856 ht=2160
+	vrs=1201 vre=1204 vt=1250
+	hsync=+ vsync=+
 
 #
 # QVGA		320x240		Quarter Video Graphics Array

+ 12 - 12
sys/src/9/pc/devusb.c

@@ -17,9 +17,9 @@ static int debug = 0;
 Usbhost*	usbhost[MaxUsb];
 
 static char *devstates[] = {
-	[Disabled]		"Disabled",
+	[Disabled]	"Disabled",
 	[Attached]	"Attached",
-	[Enabled]		"Enabled",
+	[Enabled]	"Enabled",
 	[Assigned]	"Assigned",
 	[Configured]	"Configured",
 };
@@ -64,13 +64,13 @@ enum {
 #define	PATH(t, s, c)	((t)|((s)<<SLOTSHIFT)|((c)<<CTLRSHIFT))
 
 static Dirtab usbdir2[] = {
-	"new",	{Qnew},			0,	0666,
-	"port",	{Qport},			0,	0666,
+	"new",		{Qnew},			0,	0666,
+	"port",		{Qport},		0,	0666,
 };
 
 static Dirtab usbdir3[]={
 	"ctl",		{Qctl},			0,	0666,
-	"status",	{Qstatus},			0,	0444,
+	"status",	{Qstatus},		0,	0444,
 	"setup",	{Qep0},			0,	0666,
 	/* epNdata names are generated on demand */
 };
@@ -97,19 +97,19 @@ enum
 static Cmdtab usbportmsg[] =
 {
 	PMdisable,	"disable",	2,
-	PMenable,		"enable",	2,
-	PMreset,		"reset",	2,
+	PMenable,	"enable",	2,
+	PMreset,	"reset",	2,
 };
 
 static Cmdtab usbctlmsg[] =
 {
-	CMclass,		"class",	0,
-	CMdata,		"data",	3,
-	CMdebug,		"debug",	3,
+	CMclass,	"class",	0,
+	CMdata,		"data",		3,
+	CMdebug,	"debug",	3,
 	CMep,		"ep",		6,
 	CMmaxpkt,	"maxpkt",	3,
-	CMadjust,		"adjust",	3,
-	CMspeed,		"speed",	2,
+	CMadjust,	"adjust",	3,
+	CMspeed,	"speed",	2,
 	CMunstall,	"unstall",	2,
 };