Changeset 521 for Whitix/branches/hybrid

Timestamp:

05/24/08 09:48:31 (3 months ago)

Author:

mwhitworth

Message:

Update build process.

Location:

Whitix/branches/hybrid/devices

Files:

• Makefile (modified) (2 diffs)
• net/ne2k-pci.c (modified) (5 diffs)
• storage/Makefile (modified) (1 diff)
• storage/ata/Makefile (modified) (1 diff)
• storage/ata/ata-cd.c (modified) (3 diffs)
• storage/ata/ata-disk.c (modified) (3 diffs)
• storage/ata/ata-identify.c (modified) (8 diffs)
• storage/ata/ata.c (modified) (5 diffs)
• storage/floppy.c (modified) (6 diffs)
• storage/ramdisk.c (modified) (1 diff)

Whitix/branches/hybrid/devices/Makefile

@@ -2 +2 @@
 include ../make.inc
 
-OBJS = misc.o
+MODULES = misc.sys
 
-build: $(OBJS)
+build: $(MODULES)
         make -C input
         make -C net
@@ -10 +10 @@
         make -C storage
 
+modules_install:
+        cp *.sys ../CdRoot/System/Modules/Core
+        make -C input modules_install
+        make -C net modules_install
+        make -C pci modules_install
+        make -C storage modules_install
+
 clean:
-        rm *.o -f
+        rm *.sys -f
         make -C net clean
         make -C storage clean

Whitix/branches/hybrid/devices/net/ne2k-pci.c

@@ -30 +30 @@
 {
 //      struct NetDevice* netDev=(struct NetDevice*)data;
-        printf("Ne2kIrq\n");
+        KePrint("Ne2kIrq\n");
 
         return 0;
@@ -37 +37 @@
 int Ne2kSend(struct NetDevice* device, struct SocketBuffer* sockBuff)
 {
-        printf("Ne2kSend\n");
+        KePrint("Ne2kSend\n");
         return 0;
 }
@@ -73 +73 @@
         if (ret)
         {
-                printf("NE2K: Could not enable device.\n");
+                KePrint("NE2K: Could not enable device.\n");
                 return -EIO;
         }
@@ -86 +86 @@
         if (!netDev)
         {
-                printf("NE2K: Could not allocate network device.\n");
+                KePrint("NE2K: Could not allocate network device.\n");
                 return -EIO;
         }
@@ -99 +99 @@
         if (ret)
         {
-                printf("NE2K: Could not enable device irq.\n");
+                KePrint("NE2K: Could not enable device irq.\n");
                 return -EIO;
         }
 
-        printf("NE2K: Found device. I/O base = %#X, irq = %u\n", ioAddr, device->irq);
+        KePrint("NE2K: Found device. I/O base = %#X, irq = %u\n", ioAddr, device->irq);
 
         /* Get the station (MAC) address. */

Whitix/branches/hybrid/devices/storage/Makefile

@@ -2 +2 @@
 include ../../make.inc
 
-OBJS = floppy.o ramdisk.o sdevice.o
+MODULES = floppy.sys ramdisk.sys
 
-build: $(OBJS)
+build: $(MODULES)
         make -C ata
+
+modules_install:
+        make -C ata modules_install
+        cp *.sys ../../CdRoot/System/Modules/Storage
 
 clean:
         make -C ata clean
-        rm *.o -f
+        rm *.o *.sys -f

Whitix/branches/hybrid/devices/storage/ata/Makefile

@@ -2 +2 @@
 include ../../../make.inc
 
-OBJS = ata.o ata-disk.o ata-cd.o ata-identify.o
+MODULES = ata.sys ata-disk.sys ata-cd.sys ata-identify.sys
 
-build: $(OBJS)
+build: $(MODULES)
+        ld -r $(MODULES) -o ata_ide.sys
+
+modules_install:
+        cp ata_ide.sys ../../../CdRoot/System/Modules/Storage/
 
 clean:
-        rm *.o -f
+        rm *.o *.sys -f

Whitix/branches/hybrid/devices/storage/ata/ata-cd.c

@@ -143 +143 @@
         if (request->retries > 5)
         {
-                printf("ATA-CD: failed to read, error = %#X, count = %u, status = %d\n",inb(CTRL_REG(drive->parent,REG_ERROR)),
+                KePrint("ATA-CD: failed to read, error = %#X, count = %u, status = %d\n",inb(CTRL_REG(drive->parent,REG_ERROR)),
                         AtapiTransferCount(drive->parent),status);
                 StorageEndRequest(drive->sDev,EIO);
@@ -187 +187 @@
         {
         case ATAPI_PHASE_ABORT:
-                printf("Drive aborted the command.\n");
+                KePrint("Drive aborted the command.\n");
                 AtapiError(drive,request,status);
                 break;
@@ -212 +212 @@
 
         default:
-                printf("Bad phase, %d\n",phase);
+                KePrint("Bad phase, %d\n",phase);
         };
 

Whitix/branches/hybrid/devices/storage/ata/ata-disk.c

@@ -32 +32 @@
         if (!request)
         {
-                printf("AtaRwInterrupt: request is null?\n");
+                KePrint("AtaRwInterrupt: request is null?\n");
                 return;
         }
@@ -38 +38 @@
         if (status & STATE_ERR || status & STATE_DF)
         {
-                printf("AtaRwInterrupt: failure reading sector %u\n",request->sector);
+                KePrint("AtaRwInterrupt: failure reading sector %u\n",request->sector);
                 /* Failure? If so, do it again */
                 drive->busy=0;
@@ -49 +49 @@
                 if (AtaWaitForState(drive->parent,STATE_BUSY | STATE_DRQ,STATE_DRQ))
                 {
-                        printf("Timed out waiting for read\n");
+                        KePrint("Timed out waiting for read\n");
                         drive->busy=0;
                         AtaRequest(drive);

Whitix/branches/hybrid/devices/storage/ata/ata-identify.c

@@ -116 +116 @@
         int ret=0;
 
-        Sleep(50);
+//      Sleep(50);
 
         if (cmd == CMD_ATA_PIDENTIFY)
@@ -124 +124 @@
 
         timeout=((cmd == CMD_ATA_IDENTIFY) ? 3000 : 1000)/2;
-        startTime=time;
+        startTime=PitGetQuantums();
 
         SaveFlags(flags);
@@ -131 +131 @@
         do
         {
-                if ((time-startTime) > timeout)
+                if ((PitGetQuantums()-startTime) > timeout)
                 {
                         IrqRestoreFlags(flags);
-                        printf("Identify timed out: reg = %#X\n",(DWORD)reg);
+                        KePrint("Identify timed out: reg = %#X\n",(DWORD)reg);
                         return 2;
                 }
 
-                Sleep(50); /* Don't keep pestering the drive */
+//              Sleep(50); /* Don't keep pestering the drive */
 
                 reg=inb(CTRL_REG(drive->parent,REG_CONTROL));
         }while (reg & STATE_BUSY);
 
-        Sleep(50);
+//      Sleep(50);
 
         if ((inb(CTRL_REG(drive->parent,REG_STATUS)) & (STATE_DRQ | STATE_BUSY | STATE_ERR)) == STATE_DRQ)
@@ -185 +185 @@
                 return -ENOMEM;
 
-        Sleep(50);
+//      Sleep(50);
         AtaSelectDrive(drive);
-        Sleep(50);
+//      Sleep(50);
 
         reg=inb(CTRL_REG(drive->parent,REG_SELECT));
@@ -195 +195 @@
                 /* Select drive 0 and exit */
                 outb(CTRL_REG(drive->parent,REG_STATUS),LDH_DEFAULT);
-                Sleep(50);
+//              Sleep(50);
                 return 2;
         }
@@ -218 +218 @@
         else if (ret == 2 && cmd == CMD_ATA_PIDENTIFY)
         {
-                printf("No response (%#02X) - resetting drive interface\n",inb(CTRL_REG(drive->parent,REG_COMMAND)));
-                Sleep(50);
+                KePrint("No response (%#02X) - resetting drive interface\n",inb(CTRL_REG(drive->parent,REG_COMMAND)));
+//              Sleep(50);
                 AtaSelectDrive(drive);
-                Sleep(50);
+//              Sleep(50);
                 outb(CTRL_REG(drive->parent,REG_COMMAND),ATAPI_CMD_SRST);
 
-                startTime=time;
+                startTime=PitGetQuantums();
 
                 IrqSaveFlags(flags);
@@ -230 +230 @@
 
                 do
-                        Sleep(50);
-                while ((inb(CTRL_REG(drive->parent,REG_COMMAND)) & STATE_BUSY) && (time-startTime) > 3000);
+//                      Sleep(50);
+                        asm("nop");
+                while ((inb(CTRL_REG(drive->parent,REG_COMMAND)) & STATE_BUSY) && (PitGetQuantums()-startTime) > 3000);
 
                 ret=AtaDoIdentify(drive,cmd);
@@ -278 +279 @@
                         return -EIO;
                 
-                printf("CD/DVD drive\n");
+                KePrint("CD/DVD drive\n");
         }else
-                printf("Hard Drive\n");
+                KePrint("Hard Drive\n");
 
         /* Exit with drive 0 selected */
         outb(CTRL_REG(drive->parent,REG_SELECT),LDH_DEFAULT);
-        Sleep(50);
+//      Sleep(50);
         inb(CTRL_REG(drive->parent,REG_STATUS));
 

Whitix/branches/hybrid/devices/storage/ata/ata.c

@@ -74 +74 @@
         sti();
 
-        for (startTime=time; time-startTime<100;)
+        for (startTime=PitGetQuantums(); PitGetQuantums()-startTime<100;)
         {
                 status=inb(CTRL_REG(controller,REG_CONTROL));
@@ -199 +199 @@
         while (timeOut--)
         {
-                Sleep(10);
                 reg=inb(CTRL_REG(controller,REG_STATUS));
                 if (!(reg & STATE_BUSY))
@@ -232 +231 @@
 
         /* Needs a small delay loop */
-        Sleep(1);
+//      Sleep(1);
 
         outb(CTRL_REG(controller,REG_CONTROL),CTL_EIGHTHEADS);
 
-        Sleep(10);
+//      Sleep(10);
 
         /* Wait at most 35 (!) seconds for it to unbusy itself */
@@ -247 +246 @@
 
         outb(CTRL_REG(controller,REG_CONTROL),CTL_EIGHTHEADS);
-        Sleep(1);
+//      Sleep(1);
         AtaWaitNotBusy(controller,1000);
 
         outb(CTRL_REG(controller,REG_SELECT),LDH_DEFAULT | 1 << 4);
         outb(CTRL_REG(controller,REG_CONTROL),CTL_EIGHTHEADS);
-        Sleep(1);
+//      Sleep(1);
         AtaWaitNotBusy(controller,1000);
 
@@ -356 +355 @@
         StorageQueueInit(sDevice);
 
-        printf("Partition found: %#X, %u, %u\n",(DWORD)part[i].system,part[i].startSectorAbs,part[i].sectorCount);
+        KePrint("Partition found: %#X, %u, %u\n",(DWORD)part[i].system,part[i].startSectorAbs,part[i].sectorCount);
 
         return 0;

Whitix/branches/hybrid/devices/storage/floppy.c

@@ -209 +209 @@
         if (fdc->sr0 & 0x10)
         {
-                printf("Recal failed, trying again\n");
+                KePrint("Recal failed, trying again\n");
                 FdcRecal(fdc);
                 return;
@@ -226 +226 @@
         if (!(fdc->handler))
         {
-                printf("floppy: No handler for interrupt, %#X\n",fdc->busy);
+                KePrint("floppy: No handler for interrupt, %#X\n",fdc->busy);
                 return 0;
         }
@@ -243 +243 @@
         if (UNLIKELY(err))
         {
-                printf("Floppy: I/O error, starting again\n");
-
-                printf("Floppy registers: \n");
+                KePrint("Floppy: I/O error, starting again\n");
+
+                KePrint("Floppy registers: \n");
                 int i;
                 for (i=0; i<num; i++)
-                        printf("%d: %#X\n",i,(DWORD)fdc->status[i]);
-
-                printf("err = %d,num = %d\n",err,num);
+                        KePrint("%d: %#X\n",i,(DWORD)fdc->status[i]);
+
+                KePrint("err = %d,num = %d\n",err,num);
 
                 currRequest->retries++;
@@ -266 +266 @@
                         {
                                 /* Write protected */
-                                printf("Floppy is write-protected\n");
+                                KePrint("Floppy is write-protected\n");
                         }else if (fdc->status[1] & 0x4)
                         {
-                                printf("No data. Unreadable\n");
-                                printf("Floppy thinks chs is %d,%d,%d\n",fdc->status[3],fdc->status[4],fdc->status[5]);
+                                KePrint("No data. Unreadable\n");
+                                KePrint("Floppy thinks chs is %d,%d,%d\n",fdc->status[3],fdc->status[4],fdc->status[5]);
                         }
                 }
@@ -338 +338 @@
         if ((fdc->sr0 & 0xF8) != SEEK_SUCCESS ||  fdc->currTrack != fdc->rwTrack)
         {
-                printf("Floppy seek failed\n");
+                KePrint("Floppy seek failed\n");
 
                 /* If a seek is not possible, a disk may not even be in the drive */
@@ -474 +474 @@
         IrqSaveFlags(flags);
 
-        printf("Resetting floppy\n");
+        KePrint("Resetting floppy\n");
 
         fdc->handler=FdcResetInterrupt;

Whitix/branches/hybrid/devices/storage/ramdisk.c

@@ -98 +98 @@
         }
 
-        printf("%d ramdisks loaded, of size %d\n",MAX_RAMDISKS,RAMDISK_SIZE);
+        KePrint("%d ramdisks loaded, of size %d\n",MAX_RAMDISKS,RAMDISK_SIZE);
 
         return 0;