[jimtabor] 62326: [Ext2fs] - Fixed the driver start up for Ext2 partitions and drives. Now the driver loads. - At one time this driver worked on the same hardware I have today, same drives nothing ...
Author: jimtabor Date: Tue Feb 25 03:39:23 2014 New Revision: 62326
URL: http://svn.reactos.org/svn/reactos?rev=62326&view=rev Log: [Ext2fs] - Fixed the driver start up for Ext2 partitions and drives. Now the driver loads. - At one time this driver worked on the same hardware I have today, same drives nothing has changed. Now since all the changes else where, guessing it broke something. - Don't assign and bug reports to me, if so, I will remove them!
Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/drivers/filesystems/ext2/src/ext2init.c trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c trunk/reactos/drivers/filesystems/fs_rec/ext2.c trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c
Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?r... ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Tue Feb 25 03:39:23 2014 @@ -1560,6 +1560,14 @@ HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","ImagePath",0x00020000,"system32\drivers\usbccgp.sys" HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Type",0x00010001,0x00000001 + +; MountMgr driver +;HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","ErrorControl",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Group",0x00000000,"Boot Bus Extender" +;HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","ImagePath",0x00020000,"system32\drivers\mountmgr.sys" +;HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Start",0x00010001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Tag",0x00010001,0x00000008 +;HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Type",0x00010001,0x00000001
; ACPI driver HKLM,"SYSTEM\CurrentControlSet\Services\acpi","ErrorControl",0x00010001,0x00000001 @@ -1859,7 +1867,7 @@ ; EXT2 Filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Group",0x00000000,"Boot File System" -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ImagePath",0x00020000,"system32\drivers\ext2.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ImagePath",0x00020000,"system32\drivers\ext2fs.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Type",0x00010001,0x00000002
Modified: trunk/reactos/drivers/filesystems/ext2/src/ext2init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/sr... ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/ext2init.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/ext2init.c [iso-8859-1] Tue Feb 25 03:39:23 2014 @@ -20,7 +20,7 @@ #define EXT2_BUG_CHECK_ID EXT2_FILE_INIT #define DEBUG_LEVEL (DEBUG_TRACE_INIT)
-#define EXT2_FS_NAME L"\ext2" +#define EXT2_FS_NAME L"\Ext2fs" // Must match others!
// global variables are declared here Ext2Data Ext2GlobalData;
Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/sr... ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c [iso-8859-1] Tue Feb 25 03:39:23 2014 @@ -535,6 +535,7 @@ else { DebugTrace(DEBUG_TRACE_MOUNT, "Failing mount. Partition not Ext2...", 0); + DbgPrint("Supper Blk Magic %x\n",SuperBlock->s_magic); }
try_exit: NOTHING; @@ -782,16 +783,23 @@
if (Status == STATUS_INVALID_PARAMETER) { - + DbgPrint("Ext2PerformVerifyDiskRead Invalid Param\n"); return FALSE; }
+ if (Status == STATUS_NO_MEDIA_IN_DEVICE) + { + DbgPrint("Ext2PerformVerifyDiskRead NO MEDIA in DEVICE!!! BS!!\n"); + return FALSE; + } + // // If it doesn't succeed then either return or raise the error. //
if (!NT_SUCCESS(Status)) { + DbgPrint("Ext2PerformVerifyDiskRead Fail Status %x\n",Status); return FALSE; }
Modified: trunk/reactos/drivers/filesystems/fs_rec/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec/... ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/ext2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/ext2.c [iso-8859-1] Tue Feb 25 03:39:23 2014 @@ -93,7 +93,7 @@
/* Load the file system */ Status = FsRecLoadFileSystem(DeviceObject, - L"\Registry\Machine\System\CurrentControlSet\Services\Ext2"); + L"\Registry\Machine\System\CurrentControlSet\Services\Ext2fs"); break;
default:
Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec/... ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c [iso-8859-1] Tue Feb 25 03:39:23 2014 @@ -373,14 +373,14 @@ if (NT_SUCCESS(Status)) DeviceCount++;
/* Register EXT2 */ - /*Status = FsRecRegisterFs(DriverObject, - NULL, - NULL, - L"\Ext2", + Status = FsRecRegisterFs(DriverObject, + NULL, + NULL, + L"\Ext2fs", L"\FileSystem\Ext2Recognizer", FS_TYPE_EXT2, FILE_DEVICE_DISK_FILE_SYSTEM); - if (NT_SUCCESS(Status)) DeviceCount++;*/ + if (NT_SUCCESS(Status)){ DeviceCount++; DPRINT1("2 Ext2FS!!!!!\n");}
/* Return appropriate Status */ return (DeviceCount > 0) ? STATUS_SUCCESS : STATUS_IMAGE_ALREADY_LOADED;
-
jimtabor＠svn.reactos.org