diff --git a/.gitignore b/.gitignore index e6ce5a6..60b8d17 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,7 @@ t.c *.o .depen* +/sys/sde/objgfx40.cpp +/sys/sde/ogFont.cpp +/sys/sde/ogPixCon.cpp +/sys/sde/ogPixelFmt.cpp diff --git a/sys/pci/hd.c b/sys/pci/hd.c index 3ca0180..be6db78 100644 --- a/sys/pci/hd.c +++ b/sys/pci/hd.c @@ -230,7 +230,8 @@ outportByte(hdd->hdPort + ATA_DRIVE, hdd->hdDev); outportByte(hdd->hdPort + ATA_COMMAND, ATA_IDENTIFY); - for (counter = 1000000; counter >= 0; counter--) { + //for (counter = 1000000; counter >= 0; counter--) { + for (counter = 10000000; counter >= 0; counter--) { retVal = inportByte(hdd->hdPort + ATA_COMMAND); if ((retVal & 1) != 0x0) { kprintf("Error Drive Not Available\n"); @@ -365,7 +366,8 @@ transactionCount = sectorCount >> hdd->hdShift; } for (; transactionCount > 0; transactionCount--) { - for (counter = 1000000; counter >= 0; counter--) { + //for (counter = 1000000; counter >= 0; counter--) { + for (counter = 10000000; counter >= 0; counter--) { retVal = inportByte(hdd->hdPort + hdStat) & 0x80; if (!retVal) goto ready; @@ -386,7 +388,8 @@ outportByte(hdd->hdPort + hdCmd, 0xC5); else outportByte(hdd->hdPort + hdCmd, 0x30); - for (counter = 1000000; counter >= 0; counter--) { + //for (counter = 1000000; counter >= 0; counter--) { + for (counter = 10000000; counter >= 0; counter--) { retVal = inportByte(hdd->hdPort + hdStat); if ((retVal & 1) != 0x0) { kprintf("HD Write Error\n"); @@ -428,7 +431,8 @@ transactionCount = sectorCount >> hdd->hdShift; } for (; transactionCount > 0; transactionCount--) { - for (counter = 1000000; counter >= 0; counter--) { + //for (counter = 1000000; counter >= 0; counter--) { + for (counter = 10000000; counter >= 0; counter--) { retVal = inportByte(hdd->hdPort + hdStat) & 0x80; if (!retVal) goto ready; @@ -450,7 +454,8 @@ outportByte(hdd->hdPort + hdCmd, 0xC4); else outportByte(hdd->hdPort + hdCmd, 0x20); - for (counter = 1000000; counter >= 0; counter--) { + //for (counter = 1000000; counter >= 0; counter--) { + for (counter = 10000000; counter >= 0; counter--) { retVal = inportByte(hdd->hdPort + hdStat); if ((retVal & 1) != 0x0) { kprintf("HD Read Error: [%i:0x%X:%i]\n", counter, (uInt32) baseAddr, startSector); diff --git a/sys/sde/main.cc b/sys/sde/main.cc index cbd7eb1..539f78c 100644 --- a/sys/sde/main.cc +++ b/sys/sde/main.cc @@ -64,6 +64,7 @@ printOff = 0x1; screen->ogCreate(800, 600, OG_PIXFMT_24BPP); + screen->ogClear(screen->ogPack(122, 140, 163)); systemVitals->screen = screen;