diff --git a/src/sys/devfs/devfs.c b/src/sys/devfs/devfs.c index f8086d3..6bd1880 100644 --- a/src/sys/devfs/devfs.c +++ b/src/sys/devfs/devfs.c @@ -24,6 +24,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. $Log$ + Revision 1.4 2004/04/28 02:37:34 reddawg + More updates for using the new driver subsystem + Revision 1.3 2004/04/28 02:22:54 reddawg This is a fiarly large commit but we are starting to use new driver model all around @@ -80,19 +83,14 @@ struct devFsInfo *fsInfo = fd->mp->fsInfo; struct devFsDevices *tmpDev = 0x0; struct deviceNode *device = 0x0; - kprintf("Opening DevFS File [0x%X]\n",fsInfo->deviceList); for (tmpDev = fsInfo->deviceList;tmpDev != 0x0;tmpDev = tmpDev->next) { - kprintf("[%s][%s]\n",tmpDev->devName,file); if (kstrcmp(tmpDev->devName,file) == 0x0) { - kprintf("fd->mode: %i\n",(fd->mode & 0x3)); switch ((fd->mode & 0x3)) { case 0: case 1: - kprintf("Opened Device: [%s]\n",tmpDev->devName); device = deviceFind(tmpDev->devMajor,tmpDev->devMinor); (void *)fd->start = tmpDev; (void *)fd->size = device->size; - kprintf("SIZE: [%i]\n",device->size); break; default: kprintf("Invalid File Mode\n"); @@ -119,18 +117,12 @@ struct deviceNode *device = 0x0; struct devFsDevices *tmpDev = (void *)fd->start; - kprintf("[0x%X]\n",tmpDev->devMajor); device = deviceFind(tmpDev->devMajor,tmpDev->devMinor); - kprintf("[0x%X][0x%X]\n",device,device->info); - kprintf("Reading From Device: [%s]\n",fd->fileName); - sectors = ((size+511)/512); diff = (offset - ((offset/512)*512)); - kprintf("Sectors: [%i:%i]\n",sectors,diff); - for (i=0x0;iread(device->info,fd->buffer,i + (offset/512),1); for (x=0x0;x<(size - (i*512));x++) { @@ -160,11 +152,7 @@ struct deviceNode *device = 0x0; struct devFsDevices *tmpDev = (void *)fd->start; - kprintf("[0x%X]\n",tmpDev->devMajor); device = deviceFind(tmpDev->devMajor,tmpDev->devMinor); - kprintf("[0x%X][0x%X]\n",device,device->info); - - kprintf("Writing To Device: [%s]\n",fd->fileName); for (i=0x0;i<((size+511)/512);i++) { device->read(device->info,fd->buffer,i + (offset/512),1); for (x=0x0;((x < 512) && ((x + (i * 512)) < size));x++) { @@ -197,7 +185,6 @@ tmpDev->devMajor = major; tmpDev->devMinor = minor; sprintf(tmpDev->devName,name); - kprintf("tmpDev->devName: [%s]\n",tmpDev->devName); tmpDev->next = fsInfo->deviceList; tmpDev->prev = 0x0;