Browse Source

Plan 9 from Bell Labs 2006-07-19

David du Colombier 15 years ago
parent
commit
fed52dde4a
4 changed files with 17 additions and 6 deletions
  1. 2 2
      dist/replica/_plan9.db
  2. 2 2
      dist/replica/plan9.db
  3. 2 0
      dist/replica/plan9.log
  4. 11 2
      sys/src/9/pc/devpccard.c

+ 2 - 2
dist/replica/_plan9.db

@@ -7951,7 +7951,7 @@ sys/src/9/pc/devlm78.c - 664 sys sys 1128255048 6291
 sys/src/9/pc/devlml.c - 664 sys sys 1132448361 7502
 sys/src/9/pc/devlml.h - 664 sys sys 1026847636 2948
 sys/src/9/pc/devlpt.c - 664 sys sys 1015014514 4420
-sys/src/9/pc/devpccard.c - 664 sys sys 1153082883 39122
+sys/src/9/pc/devpccard.c - 664 sys sys 1153250455 39299
 sys/src/9/pc/devrtc.c - 664 sys sys 1015014515 7167
 sys/src/9/pc/devtv.c - 664 sys sys 1131290299 45676
 sys/src/9/pc/devusb.c - 664 sys sys 1105193103 18364
@@ -8001,7 +8001,7 @@ sys/src/9/pc/mkfile - 664 sys sys 1142960857 3804
 sys/src/9/pc/mmu.c - 664 sys sys 1147098958 24086
 sys/src/9/pc/mouse.c - 664 sys sys 1098479254 7057
 sys/src/9/pc/mp.c - 664 sys sys 1146542974 17317
-sys/src/9/pc/mp.h - 664 sys sys 1131538511 6652
+sys/src/9/pc/mp.h - 664 sys sys 1153193597 6795
 sys/src/9/pc/nv_dma.h - 664 sys sys 1081384508 12943
 sys/src/9/pc/pc - 664 sys sys 1143768293 1452
 sys/src/9/pc/pcauth - 664 sys sys 1131907692 715

+ 2 - 2
dist/replica/plan9.db

@@ -7951,7 +7951,7 @@ sys/src/9/pc/devlm78.c - 664 sys sys 1128255048 6291
 sys/src/9/pc/devlml.c - 664 sys sys 1132448361 7502
 sys/src/9/pc/devlml.h - 664 sys sys 1026847636 2948
 sys/src/9/pc/devlpt.c - 664 sys sys 1015014514 4420
-sys/src/9/pc/devpccard.c - 664 sys sys 1153082883 39122
+sys/src/9/pc/devpccard.c - 664 sys sys 1153250455 39299
 sys/src/9/pc/devrtc.c - 664 sys sys 1015014515 7167
 sys/src/9/pc/devtv.c - 664 sys sys 1131290299 45676
 sys/src/9/pc/devusb.c - 664 sys sys 1105193103 18364
@@ -8001,7 +8001,7 @@ sys/src/9/pc/mkfile - 664 sys sys 1142960857 3804
 sys/src/9/pc/mmu.c - 664 sys sys 1147098958 24086
 sys/src/9/pc/mouse.c - 664 sys sys 1098479254 7057
 sys/src/9/pc/mp.c - 664 sys sys 1146542974 17317
-sys/src/9/pc/mp.h - 664 sys sys 1131538511 6652
+sys/src/9/pc/mp.h - 664 sys sys 1153193597 6795
 sys/src/9/pc/nv_dma.h - 664 sys sys 1081384508 12943
 sys/src/9/pc/pc - 664 sys sys 1143768293 1452
 sys/src/9/pc/pcauth - 664 sys sys 1131907692 715

+ 2 - 0
dist/replica/plan9.log

@@ -30207,3 +30207,5 @@
 1153083605 3 c sys/src/9/pc/pci.c - 664 sys sys 1153082883 26859
 1153173604 0 c sys/man/8/plan9.ini - 664 sys sys 1153172733 22284
 1153173604 1 c sys/src/9/pc/memory.c - 664 sys sys 1153172671 18773
+1153195206 0 c sys/src/9/pc/mp.h - 664 sys sys 1153193597 6795
+1153251006 0 c sys/src/9/pc/devpccard.c - 664 sys sys 1153250455 39299

+ 11 - 2
sys/src/9/pc/devpccard.c

@@ -705,7 +705,7 @@ powerup(Cardbus *cb)
 		wrreg(cb, Rigc, Fnotreset);
 		delay(500);
 
-		return 1;
+//		return 1;
 	}
 
 	if (state & SS_CCD)
@@ -738,7 +738,10 @@ powerup(Cardbus *cb)
 	pcicfgw16(cb->pci, PciBCR, bcr);
 	delay(100);
 
-	cb->type = PC32;
+	if (state & SS_PC16)
+		cb->type = PC16;
+	else
+		cb->type = PC32;
 
 	return 1;
 }
@@ -1868,6 +1871,12 @@ i82365probe(Cardbus *cb, int lindex, int ldata)
 		} else {
 			cb->ltype = Tpd6710;
 		}
+
+		/* low power mode */
+		outb(cb->lindex, Rmisc2 + (dev<<7));
+		c = inb(cb->ldata);
+		outb(cb->ldata, c & ~Flowpow);
+		break;
 		break;
 	}