Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[amunger] 17439: Merge TimeOut fix from trunk.

by amunger＠svn.reactos.com

Merge TimeOut fix from trunk. Modified: branches/ros-branch-0_2_7/reactos/subsys/system/usetup/bootsup.c _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/system/usetup/bootsup.c --- branches/ros-branch-0_2_7/reactos/subsys/system/usetup/bootsup.c 2005-08-19 15:28:41 UTC (rev 17438) +++ branches/ros-branch-0_2_7/reactos/subsys/system/usetup/bootsup.c 2005-08-19 17:13:37 UTC (rev 17439) @@ -50,14 +50,12 @@ L"DefaultOS", L"ReactOS"); -#if 0 /* Timeout=10 */ IniCacheInsertKey(IniSection, NULL, INSERT_LAST, L"TimeOut", L"10"); -#endif /* Create "Display" section */ IniSection = IniCacheAppendSection(IniCache, @@ -167,13 +165,6 @@ INSERT_LAST, L"SelectedColor", L"Gray"); - - /* TimeOut=5 */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"TimeOut", - L"5"); }

19 years, 1 month

[ea] 17438: XML chunks are required to contain a single node.

by ea＠svn.reactos.com

XML chunks are required to contain a single node. Modified: trunk/reactos/include/idl/idl.xml _____ Modified: trunk/reactos/include/idl/idl.xml --- trunk/reactos/include/idl/idl.xml 2005-08-19 15:27:39 UTC (rev 17437) +++ trunk/reactos/include/idl/idl.xml 2005-08-19 15:28:41 UTC (rev 17438) @@ -1,3 +1,4 @@ +<group> <module name="pnp_server" type="rpcserver"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> @@ -22,3 +23,4 @@ <define name="_X86_" /> <file switches="-o">svcctl.idl</file> </module> +</group>

19 years, 1 month

[ea] 17437: Moved keyboard mappers need to picked up from the right place.

by ea＠svn.reactos.com

Moved keyboard mappers need to picked up from the right place. Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-08-19 15:26:02 UTC (rev 17436) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-08-19 15:27:39 UTC (rev 17437) @@ -87,17 +87,17 @@ lib\imagehlp\imagehlp.dll 1 lib\imm32\imm32.dll 1 lib\iphlpapi\iphlpapi.dll 1 -lib\kbdda\kbdda.dll 1 -lib\kbddv\kbddv.dll 1 -lib\kbdes\kbdes.dll 1 -lib\kbdfr\kbdfr.dll 1 -lib\kbdgr\kbdgr.dll 1 -lib\kbdru\kbdru.dll 1 -lib\kbdse\kbdse.dll 1 -lib\kbdsg\kbdsg.dll 1 -lib\kbduk\kbduk.dll 1 -lib\kbdus\kbdus.dll 1 -lib\kbdbe\kbdbe.dll 1 +lib\keyboard\kbdbe\kbdbe.dll 1 +lib\keyboard\kbdda\kbdda.dll 1 +lib\keyboard\kbddv\kbddv.dll 1 +lib\keyboard\kbdes\kbdes.dll 1 +lib\keyboard\kbdfr\kbdfr.dll 1 +lib\keyboard\kbdgr\kbdgr.dll 1 +lib\keyboard\kbdru\kbdru.dll 1 +lib\keyboard\kbdse\kbdse.dll 1 +lib\keyboard\kbdsg\kbdsg.dll 1 +lib\keyboard\kbduk\kbduk.dll 1 +lib\keyboard\kbdus\kbdus.dll 1 lib\kernel32\kernel32.dll 1 lib\lzexpand\lz32.dll 1 lib\mesa32\mesa32.dll 1

19 years, 1 month

[ea] 17436: Group keyboard mappers in a common directory, like CPLs.

by ea＠svn.reactos.com

Group keyboard mappers in a common directory, like CPLs. Modified: trunk/reactos/lib/directory.xml Deleted: trunk/reactos/lib/kbdbe/ Deleted: trunk/reactos/lib/kbdda/ Deleted: trunk/reactos/lib/kbddv/ Deleted: trunk/reactos/lib/kbdes/ Deleted: trunk/reactos/lib/kbdfr/ Deleted: trunk/reactos/lib/kbdgr/ Deleted: trunk/reactos/lib/kbdru/ Deleted: trunk/reactos/lib/kbdse/ Deleted: trunk/reactos/lib/kbdsg/ Deleted: trunk/reactos/lib/kbduk/ Deleted: trunk/reactos/lib/kbdus/ Added: trunk/reactos/lib/keyboard/ Added: trunk/reactos/lib/keyboard/directory.xml Added: trunk/reactos/lib/keyboard/kbdbe/ Added: trunk/reactos/lib/keyboard/kbdda/ Added: trunk/reactos/lib/keyboard/kbddv/ Added: trunk/reactos/lib/keyboard/kbdes/ Added: trunk/reactos/lib/keyboard/kbdfr/ Added: trunk/reactos/lib/keyboard/kbdgr/ Added: trunk/reactos/lib/keyboard/kbdru/ Added: trunk/reactos/lib/keyboard/kbdse/ Added: trunk/reactos/lib/keyboard/kbdsg/ Added: trunk/reactos/lib/keyboard/kbduk/ Added: trunk/reactos/lib/keyboard/kbdus/ _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-08-18 22:09:29 UTC (rev 17435) +++ trunk/reactos/lib/directory.xml 2005-08-19 15:26:02 UTC (rev 17436) @@ -104,39 +104,9 @@ <directory name="iphlpapi"> <xi:include href="iphlpapi/iphlpapi.xml" /> </directory> -<directory name="kbdda"> - <xi:include href="kbdda/kbdda.xml" /> +<directory name="keyboard"> + <xi:include href="keyboard/directory.xml" /> </directory> -<directory name="kbddv"> - <xi:include href="kbddv/kbddv.xml" /> -</directory> -<directory name="kbdes"> - <xi:include href="kbdes/kbdes.xml" /> -</directory> -<directory name="kbdfr"> - <xi:include href="kbdfr/kbdfr.xml" /> -</directory> -<directory name="kbdgr"> - <xi:include href="kbdgr/kbdgr.xml" /> -</directory> -<directory name="kbdru"> - <xi:include href="kbdru/kbdru.xml" /> -</directory> -<directory name="kbdse"> - <xi:include href="kbdse/kbdse.xml" /> -</directory> -<directory name="kbdsg"> - <xi:include href="kbdsg/kbdsg.xml" /> -</directory> -<directory name="kbduk"> - <xi:include href="kbduk/kbduk.xml" /> -</directory> -<directory name="kbdus"> - <xi:include href="kbdus/kbdus.xml" /> -</directory> -<directory name="kbdbe"> - <xi:include href="kbdbe/kbdbe.xml" /> -</directory> <directory name="kernel32"> <xi:include href="kernel32/kernel32.xml" /> </directory> _____ Added: trunk/reactos/lib/keyboard/directory.xml --- trunk/reactos/lib/keyboard/directory.xml 2005-08-18 22:09:29 UTC (rev 17435) +++ trunk/reactos/lib/keyboard/directory.xml 2005-08-19 15:26:02 UTC (rev 17436) @@ -0,0 +1,35 @@ +<group> + <directory name="kbdda"> + <xi:include href="kbdda/kbdda.xml" /> + </directory> + <directory name="kbddv"> + <xi:include href="kbddv/kbddv.xml" /> + </directory> + <directory name="kbdes"> + <xi:include href="kbdes/kbdes.xml" /> + </directory> + <directory name="kbdfr"> + <xi:include href="kbdfr/kbdfr.xml" /> + </directory> + <directory name="kbdgr"> + <xi:include href="kbdgr/kbdgr.xml" /> + </directory> + <directory name="kbdru"> + <xi:include href="kbdru/kbdru.xml" /> + </directory> + <directory name="kbdse"> + <xi:include href="kbdse/kbdse.xml" /> + </directory> + <directory name="kbdsg"> + <xi:include href="kbdsg/kbdsg.xml" /> + </directory> + <directory name="kbduk"> + <xi:include href="kbduk/kbduk.xml" /> + </directory> + <directory name="kbdus"> + <xi:include href="kbdus/kbdus.xml" /> + </directory> + <directory name="kbdbe"> + <xi:include href="kbdbe/kbdbe.xml" /> + </directory> +</group> Property changes on: trunk/reactos/lib/keyboard/directory.xml ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Copied: trunk/reactos/lib/keyboard/kbdbe (from rev 17435, trunk/reactos/lib/kbdbe) _____ Copied: trunk/reactos/lib/keyboard/kbdda (from rev 17435, trunk/reactos/lib/kbdda) _____ Copied: trunk/reactos/lib/keyboard/kbddv (from rev 17435, trunk/reactos/lib/kbddv) _____ Copied: trunk/reactos/lib/keyboard/kbdes (from rev 17435, trunk/reactos/lib/kbdes) _____ Copied: trunk/reactos/lib/keyboard/kbdfr (from rev 17435, trunk/reactos/lib/kbdfr) _____ Copied: trunk/reactos/lib/keyboard/kbdgr (from rev 17435, trunk/reactos/lib/kbdgr) _____ Copied: trunk/reactos/lib/keyboard/kbdru (from rev 17435, trunk/reactos/lib/kbdru) _____ Copied: trunk/reactos/lib/keyboard/kbdse (from rev 17435, trunk/reactos/lib/kbdse) _____ Copied: trunk/reactos/lib/keyboard/kbdsg (from rev 17435, trunk/reactos/lib/kbdsg) _____ Copied: trunk/reactos/lib/keyboard/kbduk (from rev 17435, trunk/reactos/lib/kbduk) _____ Copied: trunk/reactos/lib/keyboard/kbdus (from rev 17435, trunk/reactos/lib/kbdus)

19 years, 1 month

[gvg] 17435: SVN maintenance

by gvg＠svn.reactos.com

SVN maintenance Property changes on: trunk/reactos/lib/ddraw ___________________________________________________________________ Name: svn:ignore + makefile

19 years, 1 month

[gvg] 17434: Import VMware open source BusLogic driver

by gvg＠svn.reactos.com

Import VMware open source BusLogic driver Hartmut made it work in ReactOS. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/bootdata/txtsetup.sif Added: trunk/reactos/drivers/storage/buslogic/ Modified: trunk/reactos/drivers/storage/buslogic/BusLogic958.c Modified: trunk/reactos/drivers/storage/buslogic/BusLogic958.h Added: trunk/reactos/drivers/storage/buslogic/README.ReactOS Added: trunk/reactos/drivers/storage/buslogic/buslogic.xml Deleted: trunk/reactos/drivers/storage/buslogic/makefile Added: trunk/reactos/drivers/storage/buslogic/makefile.original Modified: trunk/reactos/drivers/storage/directory.xml _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-08-18 21:37:18 UTC (rev 17433) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-08-18 21:59:20 UTC (rev 17434) @@ -611,6 +611,10 @@ if (!LoadDriver(SourcePath, "atapi.sys")) return; + /* Load buslogic.sys (depends on hardware detection) */ + if (!LoadDriver(SourcePath, "buslogic.sys")) + return; + /* Load class2.sys */ if (!LoadDriver(SourcePath, "class2.sys")) return; _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-08-18 21:37:18 UTC (rev 17433) +++ trunk/reactos/bootdata/hivesys.inf 2005-08-18 21:59:20 UTC (rev 17434) @@ -376,6 +376,14 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Type",0x00010001,0x00000 001 HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Tag",0x00010001,0x000000 10 +; BusLogic 958 miniport driver +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ErrorControl",0x0001 0001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Group",0x00000000,"S CSI Miniport" +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ImagePath",0x0002000 0,"system32\drivers\buslogic.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Start",0x00010001,0x 00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Type",0x00010001,0x0 0000001 +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Tag",0x00010001,0x00 000020 + ; ACPI driver HKLM,"SYSTEM\CurrentControlSet\Services\ACPI","ErrorControl",0x00010001, 0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\ACPI","Group",0x00000000,"Boot Bus Extender" _____ Modified: trunk/reactos/bootdata/txtsetup.sif --- trunk/reactos/bootdata/txtsetup.sif 2005-08-18 21:37:18 UTC (rev 17433) +++ trunk/reactos/bootdata/txtsetup.sif 2005-08-18 21:59:20 UTC (rev 17434) @@ -14,6 +14,7 @@ [SourceFiles] ; <filename> = <directory_id> atapi.sys = 3 +buslogic.sys = 3 blue.sys = 3 c_437.nls = 2 c_1252.nls = 2 _____ Copied: trunk/reactos/drivers/storage/buslogic (from rev 17433, vendor/VMware/buslogic/current) Property changes on: trunk/reactos/drivers/storage/buslogic ___________________________________________________________________ Name: svn:ignore + makefile _____ Modified: trunk/reactos/drivers/storage/buslogic/BusLogic958.c --- vendor/VMware/buslogic/current/BusLogic958.c 2005-08-18 21:37:18 UTC (rev 17433) +++ trunk/reactos/drivers/storage/buslogic/BusLogic958.c 2005-08-18 21:59:20 UTC (rev 17434) @@ -70,6 +70,7 @@ #include "BusLogic958.h" ULONG +STDCALL DriverEntry(IN PVOID DriverObject, IN PVOID Argument2 ) @@ -86,16 +87,16 @@ ULONG Status; ULONG i; ULONG HwContext; - static int cardNo = 0; +// static int cardNo = 0; UCHAR VendorId[4] = { '1', '0', '4', 'b' }; UCHAR DeviceId[4] = { '1', '0', '4', '0' }; - DebugPrint((0,"\n BusLogic - Inside the DriverEntry function \n")); + DebugPrint((0,"\n BusLogic - Inside the DriverEntry function \n")); // Zero out structure. for (i = 0; i < sizeof(HW_INITIALIZATION_DATA); i++) - { + { ((PUCHAR) & hwInitializationData)[i] = 0; } @@ -104,18 +105,18 @@ // Set entry points. hwInitializationData.HwInitialize = BT958HwInitialize; - hwInitializationData.HwResetBus = BT958HwResetBus; + hwInitializationData.HwResetBus = BT958HwResetBus; hwInitializationData.HwStartIo = BT958HwStartIO; hwInitializationData.HwInterrupt = BT958HwInterrupt; hwInitializationData.HwAdapterControl = BT958HwAdapterControl; - hwInitializationData.HwFindAdapter = BT958HwFindAdapter; + hwInitializationData.HwFindAdapter = BT958HwFindAdapter; - // Inidicate no buffer mapping but will need physical addresses + // Inidicate no buffer mapping but will need physical addresses hwInitializationData.NeedPhysicalAddresses = TRUE; - // Indicate Auto request sense is supported - hwInitializationData.AutoRequestSense = TRUE; - hwInitializationData.MultipleRequestPerLu = TRUE; + // Indicate Auto request sense is supported + hwInitializationData.AutoRequestSense = TRUE; + hwInitializationData.MultipleRequestPerLu = TRUE; #if TAG_QUEUING hwInitializationData.TaggedQueuing = TRUE; @@ -125,7 +126,7 @@ hwInitializationData.AdapterInterfaceType = PCIBus; - // Fill in the vendor id and the device id + // Fill in the vendor id and the device id hwInitializationData.VendorId = &VendorId; hwInitializationData.VendorIdLength = 4; hwInitializationData.DeviceId = &DeviceId; @@ -135,36 +136,36 @@ hwInitializationData.NumberOfAccessRanges = 2; - // Specify size of extensions. + // Specify size of extensions. hwInitializationData.DeviceExtensionSize = sizeof(HW_DEVICE_EXTENSION); - // logical unit extension + // logical unit extension hwInitializationData.SrbExtensionSize = sizeof(BusLogic_CCB_T); HwContext = 0; - DebugPrint((0,"\n BusLogic - Calling the ScsiPortInitialize Routine\n")); + DebugPrint((0,"\n BusLogic - Calling the ScsiPortInitialize Routine\n")); Status = ScsiPortInitialize(DriverObject, Argument2, &hwInitializationData, &HwContext); - DebugPrint((0,"\n BusLogic - Exiting the DriverEntry function \n")); - DebugPrint((0,"\n BusLogic - Status = %ul \n", Status)); + DebugPrint((0,"\n BusLogic - Exiting the DriverEntry function \n")); + DebugPrint((0,"\n BusLogic - Status = %ul \n", Status)); return( Status ); } // end DriverEntry() ULONG +STDCALL BT958HwFindAdapter(IN PVOID HwDeviceExtension, - IN PVOID Context, - IN PVOID BusInformation, - IN PCHAR ArgumentString, - IN OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo, - OUT PBOOLEAN Again - ) + IN PVOID Context, + IN PVOID BusInformation, + IN PCHAR ArgumentString, + IN OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo, + OUT PBOOLEAN Again) //______________________________________________________________________ ___________________________ // Routine Description: // This function is called by the OS-specific port driver after the necessary storage @@ -192,61 +193,61 @@ { PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension; BusLogic_HostAdapter_T *hcsp = &(deviceExtension->hcs); - static UCHAR k = 0; +// static UCHAR k = 0; PACCESS_RANGE accessRange; - PCI_COMMON_CONFIG PCICommonConfig; +// PCI_COMMON_CONFIG PCICommonConfig; PUCHAR pciAddress, portFound; char NumPort = 0; - DebugPrint((0,"\n BusLogic - Inside the Find Adapter Routine\n")); + DebugPrint((0,"\n BusLogic - Inside the Find Adapter Routine\n")); *Again = FALSE; - accessRange = &((*(ConfigInfo->AccessRanges))[0]); + accessRange = &((*(ConfigInfo->AccessRanges))[0]); // Inform SCSIPORT that we are NOT a WMI data provider // Sirish, 10th June 2002 ConfigInfo->WmiDataProvider = FALSE; /*Sirish, 10th June 2002 BT958WmiInitialize(deviceExtension);*/ - // Check for configuration information passed in form the system - if ((*ConfigInfo->AccessRanges)[0].RangeLength != 0) + // Check for configuration information passed in form the system + if ((*ConfigInfo->AccessRanges)[0].RangeLength != 0) + { + // check if the system supplied bus-relative address is valid and has not been + // claimed by anyother device + if ( ScsiPortValidateRange(deviceExtension, + ConfigInfo->AdapterInterfaceType, + ConfigInfo->SystemIoBusNumber, + accessRange->RangeStart, + accessRange->RangeLength, + TRUE) ) // TRUE: iniospace { - // check if the system supplied bus-relative address is valid and has not been - // claimed by anyother device - if ( ScsiPortValidateRange(deviceExtension, - ConfigInfo->AdapterInterfaceType, - ConfigInfo->SystemIoBusNumber, - accessRange->RangeStart, - accessRange->RangeLength, - TRUE) ) // TRUE: iniospace - { - DebugPrint((0,"\n BusLogic - BusLogic - Validate Range function suceeded \n")); + DebugPrint((0,"\n BusLogic - BusLogic - Validate Range function suceeded \n")); - // Map the Bus-relative range addresses to system-space logical range addresses - // so that these mapped logical addresses can be called with SciPortRead/Writexxx - // to determine whether the adapter is an HBA that the driver supports + // Map the Bus-relative range addresses to system-space logical range addresses + // so that these mapped logical addresses can be called with SciPortRead/Writexxx + // to determine whether the adapter is an HBA that the driver supports - pciAddress = (PUCHAR) ScsiPortGetDeviceBase(deviceExtension, - ConfigInfo->AdapterInterfaceType, - ConfigInfo->SystemIoBusNumber, - accessRange->RangeStart, - accessRange->RangeLength, - TRUE); // TRUE: iniospace + pciAddress = (PUCHAR) ScsiPortGetDeviceBase(deviceExtension, + ConfigInfo->AdapterInterfaceType, + ConfigInfo->SystemIoBusNumber, + accessRange->RangeStart, + accessRange->RangeLength, + TRUE); // TRUE: iniospace - if(pciAddress) - { - DebugPrint((0,"\n BusLogic - Get Device Base function suceeded \n")); + if(pciAddress) + { + DebugPrint((0,"\n BusLogic - Get Device Base function suceeded \n")); - memset(hcsp, 0, sizeof(BusLogic_HostAdapter_T)); + memset(hcsp, 0, sizeof(BusLogic_HostAdapter_T)); - // points to structure of type BT958_HA which has device specific information. This needs - // to be either changed or modified with our specific info. - hcsp->IO_Address = pciAddress; - hcsp->IRQ_Channel = (UCHAR)ConfigInfo->BusInterruptLevel; - NumPort++; - } - } + // points to structure of type BT958_HA which has device specific information. This needs + // to be either changed or modified with our specific info. + hcsp->IO_Address = pciAddress; + hcsp->IRQ_Channel = (UCHAR)ConfigInfo->BusInterruptLevel; + NumPort++; + } + } } if (NumPort == 0) @@ -534,8 +535,7 @@ if (StatusRegister.Bits.DataInRegisterReady) { - UCHAR ErrorCode = BusLogic_ReadDataInRegister(HostAdapter); - DebugPrint((0,"HOST ADAPTER ERROR CODE = %d\n", ErrorCode)); + DebugPrint((0,"HOST ADAPTER ERROR CODE = %d\n", BusLogic_ReadDataInRegister(HostAdapter))); } return FALSE; } @@ -834,7 +834,7 @@ BusLogic_GeometryRegister_T GeometryRegister; BusLogic_RequestedReplyLength_T RequestedReplyLength; UCHAR *TargetPointer, Character; - int TargetID, i; + ULONG /*TargetID,*/ i; // Issue the Inquire Board ID command. @@ -948,7 +948,7 @@ *TargetPointer = '\0'; // Issue the Inquire Firmware Version Letter command. - if (strcmp(HostAdapter->FirmwareVersion, "3.3") >= 0) + if (strcmp((char*)HostAdapter->FirmwareVersion, "3.3") >= 0) { if (BusLogic_Command(HostAdapter, BusLogic_InquireFirmwareVersionLetter, @@ -1110,7 +1110,7 @@ HostAdapter->HostAdapterQueueDepth = 192; } - if (strcmp(HostAdapter->FirmwareVersion, "3.31") >= 0) + if (strcmp((char*)HostAdapter->FirmwareVersion, "3.31") >= 0) { HostAdapter->StrictRoundRobinModeSupport = TRUE; HostAdapter->MailboxCount = BusLogic_MaxMailboxes; @@ -1134,8 +1134,8 @@ // // Initialize the Host Adapter Full Model Name from the Model Name. - strcpy(HostAdapter->FullModelName, "BusLogic "); - strcat(HostAdapter->FullModelName, HostAdapter->ModelName); + strcpy((char*)HostAdapter->FullModelName, "BusLogic "); + strcat((char*)HostAdapter->FullModelName, (char*)HostAdapter->ModelName); // Tagged Queuing is only allowed if Disconnect/Reconnect is permitted. // Therefore, mask the Tagged Queuing Permitted Default bits with the @@ -1304,7 +1304,7 @@ //______________________________________________________________________ ___ { BusLogic_InstalledDevices_T InstalledDevices; - BusLogic_InstalledDevices8_T InstalledDevicesID0to7; +// BusLogic_InstalledDevices8_T InstalledDevicesID0to7; BusLogic_SetupInformation_T SetupInformation; BusLogic_SynchronousPeriod_T SynchronousPeriod; BusLogic_RequestedReplyLength_T RequestedReplyLength; @@ -1323,7 +1323,7 @@ // Period commands will return valid data. The Inquire Target Devices command // is preferable to Inquire Installed Devices ID 0 to 7 since it only probes // Logical Unit 0 of each Target Device. - if (strcmp(HostAdapter->FirmwareVersion, "4.25") >= 0) + if (strcmp((char*)HostAdapter->FirmwareVersion, "4.25") >= 0) { if (BusLogic_Command(HostAdapter, BusLogic_InquireTargetDevices, @@ -1361,7 +1361,7 @@ ? SetupInformation.SynchronousValuesID0to7[TargetID].Offset : SetupInformation.SynchronousValuesID8to15[TargetID-8].Offset); } - if (strcmp(HostAdapter->FirmwareVersion, "5.06L") >= 0) + if (strcmp((char*)HostAdapter->FirmwareVersion, "5.06L") >= 0) { for (TargetID = 0; TargetID < HostAdapter->MaxTargetDevices; TargetID++) { @@ -1399,6 +1399,7 @@ return TRUE; }// end BusLogic_TargetDeviceInquiry +VOID BusLogic_InitializeCCB( PBuslogic_CCB_T CCB) { CCB->Opcode = BusLogic_InitiatorCCB; @@ -1431,6 +1432,7 @@ } BOOLEAN +STDCALL BT958HwStartIO(IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb ) @@ -1449,9 +1451,9 @@ //______________________________________________________________________ ____________ { PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension; - PNONCACHED_EXTENSION noncachedExtension = deviceExtension->NoncachedExtension; +// PNONCACHED_EXTENSION noncachedExtension = deviceExtension->NoncachedExtension; BusLogic_HostAdapter_T *HostAdapter = &(deviceExtension->hcs); - BusLogic_OutgoingMailbox_T mailboxOut; +// BusLogic_OutgoingMailbox_T mailboxOut; PSCSI_REQUEST_BLOCK AbortSRB; PBuslogic_CCB_T ccb; @@ -1739,12 +1741,12 @@ ULONG length; - UCHAR *Cdb = Srb->Cdb; - PCDB RealCdb ; +// UCHAR *Cdb = Srb->Cdb; +// PCDB RealCdb ; UCHAR CDB_Length = Srb->CdbLength; UCHAR TargetID = Srb->TargetId; UCHAR LogicalUnit = Srb->Lun; - void *BufferPointer = Srb->DataBuffer; +// void *BufferPointer = Srb->DataBuffer; int BufferLength = Srb->DataTransferLength; if (Srb->DataTransferLength > 0) @@ -1942,6 +1944,7 @@ BOOLEAN +STDCALL BT958HwInterrupt(IN PVOID HwDeviceExtension) //______________________________________________________________________ ___ // Routine Description: @@ -1961,13 +1964,13 @@ //______________________________________________________________________ ___ { PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension; - PNONCACHED_EXTENSION noncachedExtension = deviceExtension->NoncachedExtension; +// PNONCACHED_EXTENSION noncachedExtension = deviceExtension->NoncachedExtension; BusLogic_HostAdapter_T *HostAdapter = &(deviceExtension->hcs); - PBuslogic_CCB_T ccb; - PSCSI_REQUEST_BLOCK srb; +// PBuslogic_CCB_T ccb; +// PSCSI_REQUEST_BLOCK srb; - ULONG residualBytes; - ULONG i; +// ULONG residualBytes; +// ULONG i; BusLogic_InterruptRegister_T InterruptRegister; @@ -2213,8 +2216,8 @@ case BusLogic_CommandCompletedWithError: { - PCDB RealCdb = (PCDB)CCB->CDB; - DebugPrint((0,"%x Command completed with error Host - %x Target %x \n",RealCdb->CDB6GENERIC.OperationCode, +// PCDB RealCdb = (PCDB)CCB->CDB; + DebugPrint((0,"%x Command completed with error Host - %x Target %x \n",((PCDB)CCB->CDB)->CDB6GENERIC.OperationCode, CCB->HostAdapterStatus, CCB->TargetDeviceStatus)); @@ -2290,7 +2293,7 @@ // This function returns the error code that should be returned to port driver //______________________________________________________________________ ___________________ { - UCHAR HostStatus; + UCHAR HostStatus = 0; // Namita 2Oct CDROM issue if (TargetDeviceStatus != BusLogic_OperationGood && (HostAdapterStatus == BusLogic_CommandCompletedNormally || @@ -2310,7 +2313,12 @@ { HostStatus = SRB_STATUS_BUSY; } - } + break; + case BusLogic_OperationGood: + + HostStatus = SRB_STATUS_SUCCESS; + break; + } } else @@ -2404,6 +2412,7 @@ BOOLEAN +STDCALL BT958HwResetBus(IN PVOID HwDeviceExtension, IN ULONG PathId) //______________________________________________________________________ _______________ @@ -2420,8 +2429,8 @@ { PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension; BusLogic_HostAdapter_T *HostAdapter = &(deviceExtension->hcs); - BusLogic_CCB_T *CCB; - int TargetID; +// BusLogic_CCB_T *CCB; +// int TargetID; BOOLEAN Result; BOOLEAN HardReset; @@ -2571,6 +2580,7 @@ } BOOLEAN +STDCALL BT958HwInitialize(IN PVOID HwDeviceExtension) //______________________________________________________________________ _________ // Routine Description: @@ -2601,6 +2611,7 @@ }// end BT958HwInitialize SCSI_ADAPTER_CONTROL_STATUS +STDCALL BT958HwAdapterControl(IN PVOID HwDeviceExtension, IN SCSI_ADAPTER_CONTROL_TYPE ControlType, IN PVOID Parameters) @@ -2626,20 +2637,20 @@ { PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension; BusLogic_HostAdapter_T *HostAdapter = &(deviceExtension->hcs); - UCHAR *ParameterPointer; - BusLogic_StatusRegister_T StatusRegister; - BusLogic_InterruptRegister_T InterruptRegister; - int Result,ParameterLength; - long TimeoutCounter; +// UCHAR *ParameterPointer; +// BusLogic_StatusRegister_T StatusRegister; +// BusLogic_InterruptRegister_T InterruptRegister; +// int Result,ParameterLength; +// long TimeoutCounter; PSCSI_SUPPORTED_CONTROL_TYPE_LIST ControlTypeList; ULONG AdjustedMaxControlType; ULONG Index; - UCHAR Retries; +// UCHAR Retries; // Default Status - SCSI_ADAPTER_CONTROL_STATUS Status = ScsiAdapterControlSuccess; +// SCSI_ADAPTER_CONTROL_STATUS Status = ScsiAdapterControlSuccess; // // Structure defining which functions this miniport supports _____ Modified: trunk/reactos/drivers/storage/buslogic/BusLogic958.h --- vendor/VMware/buslogic/current/BusLogic958.h 2005-08-18 21:37:18 UTC (rev 17433) +++ trunk/reactos/drivers/storage/buslogic/BusLogic958.h 2005-08-18 21:59:20 UTC (rev 17434) @@ -37,10 +37,18 @@ #ifndef _BT958_H_ #define _BT958_H_ -#include "miniport.h" -#include "scsi.h" -#include "scsiwmi.h" +#include <ddk/ntddk.h> +#include <ddk/srb.h> +#include <ddk/scsi.h> +#include <ddk/ntddscsi.h> +#include <ddk/scsiwmi.h> +//#include <ntos/kefuncs.h> + +//#include "miniport.h" +//#include "scsi.h" +//#include "scsiwmi.h" + //______________________________________________________________________ ___________________ // #defines //______________________________________________________________________ ___________________ @@ -640,8 +648,9 @@ BusLogic_MCA_Bus = 5 }BusLogic_HostAdapterBusType_T; +#if 0 static char *BusLogic_HostAdapterBusNames[] = { "Unknown", "ISA", "EISA", "PCI", "VESA", "MCA" }; - +#endif static BusLogic_HostAdapterBusType_T BusLogic_HostAdapterBusTypes[] ={ BusLogic_VESA_Bus, /* BT-4xx */ BusLogic_ISA_Bus, /* BT-5xx */ @@ -650,7 +659,6 @@ BusLogic_Unknown_Bus, /* BT-8xx */ BusLogic_PCI_Bus /* BT-9xx */ }; - // Define the BusLogic Driver Host Adapter structure typedef struct BusLogic_HostAdapter { @@ -802,44 +810,51 @@ // function declaractions //______________________________________________________________________ ___________________ ULONG +STDCALL DriverEntry(IN PVOID DriverObject, IN PVOID Argument2 ); ULONG +STDCALL BT958HwFindAdapter(IN PVOID HwDeviceExtension, IN PVOID Context, IN PVOID BusInformation, IN PCHAR ArgumentString, IN OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo, - OUT PBOOLEAN Again - ); + OUT PBOOLEAN Again); -BOOLEAN +BOOLEAN +STDCALL BT958HwInitialize(IN PVOID HwDeviceExtension); BOOLEAN +STDCALL BT958HwStartIO(IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb ); BOOLEAN +STDCALL BT958HwInterrupt(IN PVOID HwDeviceExtension); BOOLEAN +STDCALL BT958HwResetBus(IN PVOID HwDeviceExtension, IN ULONG PathId ); SCSI_ADAPTER_CONTROL_STATUS +STDCALL BT958HwAdapterControl(IN PVOID HwDeviceExtension, IN SCSI_ADAPTER_CONTROL_TYPE ControlType, IN PVOID Parameters ); +#if 0 BOOLEAN BT958WmiSrb(IN PHW_DEVICE_EXTENSION HwDeviceExtension, IN OUT PSCSI_WMI_REQUEST_BLOCK Srb); - +#endif void BT958WmiInitialize( IN PHW_DEVICE_EXTENSION HwDeviceExtension); _____ Added: trunk/reactos/drivers/storage/buslogic/README.ReactOS --- vendor/VMware/buslogic/current/README.ReactOS 2005-08-18 21:37:18 UTC (rev 17433) +++ trunk/reactos/drivers/storage/buslogic/README.ReactOS 2005-08-18 21:59:20 UTC (rev 17434) @@ -0,0 +1,11 @@ +This code was published by VMware on their website at +http://www.vmware.com/download/open_sources.html. The intro there says: + +This open source software is licensed under the terms of various open source +license agreements included with the materials relating to the open source +software. Copyrights in the open source software are held by the copyright +holders indicated in the copyright notices in the open source files. You may +download this software free of charge. + +The source files indicate they are GPL licenced, so we're ok to include it +in ReactOS. Property changes on: trunk/reactos/drivers/storage/buslogic/README.ReactOS ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/storage/buslogic/buslogic.xml --- vendor/VMware/buslogic/current/buslogic.xml 2005-08-18 21:37:18 UTC (rev 17433) +++ trunk/reactos/drivers/storage/buslogic/buslogic.xml 2005-08-18 21:59:20 UTC (rev 17434) @@ -0,0 +1,10 @@ +<module name="buslogic" type="kernelmodedriver" installbase="system32/drivers" installname="buslogic.sys"> + <bootstrap base="reactos" /> + <define name="__USE_W32API" /> + <include base="buslogic">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <library>scsiport</library> + <file>BusLogic958.c</file> + <file>BusLogic958.rc</file> +</module> Property changes on: trunk/reactos/drivers/storage/buslogic/buslogic.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Deleted: trunk/reactos/drivers/storage/buslogic/makefile --- vendor/VMware/buslogic/current/makefile 2005-08-18 21:37:18 UTC (rev 17433) +++ trunk/reactos/drivers/storage/buslogic/makefile 2005-08-18 21:59:20 UTC (rev 17434) @@ -1,7 +0,0 @@ -# -# DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source -# file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK -# - -!INCLUDE $(NTMAKEENV)\makefile.def _____ Copied: trunk/reactos/drivers/storage/buslogic/makefile.original (from rev 17433, vendor/VMware/buslogic/current/makefile) _____ Modified: trunk/reactos/drivers/storage/directory.xml --- trunk/reactos/drivers/storage/directory.xml 2005-08-18 21:37:18 UTC (rev 17433) +++ trunk/reactos/drivers/storage/directory.xml 2005-08-18 21:59:20 UTC (rev 17434) @@ -1,6 +1,9 @@ <directory name="atapi"> <xi:include href="atapi/atapi.xml" /> </directory> +<directory name="buslogic"> + <xi:include href="buslogic/buslogic.xml" /> +</directory> <directory name="cdrom"> <xi:include href="cdrom/cdrom.xml" /> </directory>

19 years, 1 month

[gvg] 17433: Tag vendor drop

by gvg＠svn.reactos.com

Tag vendor drop Added: vendor/VMware/buslogic/20030923/ _____ Copied: vendor/VMware/buslogic/20030923 (from rev 17432, vendor/VMware/buslogic/current)

19 years, 1 month

[gvg] 17432: VMware BusLogic SCSI driver vendor drop

by gvg＠svn.reactos.com

VMware BusLogic SCSI driver vendor drop Added: vendor/VMware/ Added: vendor/VMware/buslogic/ Added: vendor/VMware/buslogic/current/ Added: vendor/VMware/buslogic/current/BT958.bmf Added: vendor/VMware/buslogic/current/BT958.mof Added: vendor/VMware/buslogic/current/BT958dt.h Added: vendor/VMware/buslogic/current/BusLogic958.c Added: vendor/VMware/buslogic/current/BusLogic958.h Added: vendor/VMware/buslogic/current/BusLogic958.rc Added: vendor/VMware/buslogic/current/Log.c Added: vendor/VMware/buslogic/current/Log.h Added: vendor/VMware/buslogic/current/makefile Added: vendor/VMware/buslogic/current/makefile.inc Added: vendor/VMware/buslogic/current/resource.h Added: vendor/VMware/buslogic/current/sources Added: vendor/VMware/buslogic/current/wmi.c _____ Added: vendor/VMware/buslogic/current/BT958.bmf (Binary files differ) Property changes on: vendor/VMware/buslogic/current/BT958.bmf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: vendor/VMware/buslogic/current/BT958.mof --- vendor/VMware/buslogic/current/BT958.mof 2005-08-18 21:25:04 UTC (rev 17431) +++ vendor/VMware/buslogic/current/BT958.mof 2005-08-18 21:36:35 UTC (rev 17432) @@ -0,0 +1,30 @@ +[ + Dynamic, Provider("WMIProv"), + WMI, + Description ("BT958 Extended Setup Information (Operation Code 8Dh)"), + guid ("{CBD60D59-CE49-4cf4-AB7A-DEC6F4988D1A}"), + HeaderName("BT958ExtendedSetupInfo"), + GuidName1("BT958Wmi_ExtendedSetupInfo_Guid"), + WmiExpense(0) +] +class BT958ExtendedSetupInfoGuid +{ + [read,key] String InstanceName; + [read] boolean Active; + + [read, WmiDataId(1), WmiVersion(1)] uint8 BusType; + [read, WmiDataId(2), WmiVersion(1)] uint8 BIOS_Address; + [read, WmiDataId(3), WmiVersion(1)] uint16 ScatterGatherLimit; + [read, WmiDataId(4), WmiVersion(1)] uint8 MailboxCount; + [read, WmiDataId(5), WmiVersion(1)] uint32 BaseMailboxAddress; + [read, WmiDataId(6), WmiVersion(1)] boolean FastOnEISA:1; + [read, WmiDataId(7), WmiVersion(1)] boolean LevelSensitiveInterrupt:1; + [read, WmiDataId(8), WmiVersion(1), max(3)] uint8 FirmwareRevision[]; + [read, WmiDataId(9), WmiVersion(1)] boolean HostWideSCSI:1; + [read, WmiDataId(10), WmiVersion(1)] boolean HostDifferentialSCSI:1; + [read, WmiDataId(11), WmiVersion(1)] boolean HostSupportsSCAM:1; + [read, WmiDataId(12), WmiVersion(1)] boolean HostUltraSCSI:1; + [read, WmiDataId(13), WmiVersion(1)] boolean HostSmartTermination:1; +}; + + Property changes on: vendor/VMware/buslogic/current/BT958.mof ___________________________________________________________________ Name: svn:eol-style + native _____ Added: vendor/VMware/buslogic/current/BT958dt.h --- vendor/VMware/buslogic/current/BT958dt.h 2005-08-18 21:25:04 UTC (rev 17431) +++ vendor/VMware/buslogic/current/BT958dt.h 2005-08-18 21:36:35 UTC (rev 17432) @@ -0,0 +1,105 @@ +/* + * vmscsi-- Miniport driver for the Buslogic BT 958 SCSI Controller + * under Windows 2000/XP/Server 2003 + * + * Based in parts on the buslogic driver for the same device + * available with the GNU Linux Operating System. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + + +#ifndef _BT958dt_h_ +#define _BT958dt_h_ + +// BT958ExtendedSetupInfoGuid - BT958ExtendedSetupInfo +// BT958 Extended Setup Information (Operation Code 8Dh) +#define BT958Wmi_ExtendedSetupInfo_Guid \ + { 0xcbd60d59,0xce49,0x4cf4, { 0xab,0x7a,0xde,0xc6,0xf4,0x98,0x8d,0x1a } } + +DEFINE_GUID(BT958ExtendedSetupInfoGuid_GUID, \ + 0xcbd60d59,0xce49,0x4cf4,0xab,0x7a,0xde,0xc6,0xf4,0x98,0x8d,0x1a); + + +typedef struct _BT958ExtendedSetupInfo +{ + // + UCHAR BusType; + #define BT958ExtendedSetupInfo_BusType_SIZE sizeof(UCHAR) + #define BT958ExtendedSetupInfo_BusType_ID 1 + + // + UCHAR BIOS_Address; + #define BT958ExtendedSetupInfo_BIOS_Address_SIZE sizeof(UCHAR) + #define BT958ExtendedSetupInfo_BIOS_Address_ID 2 + + // + USHORT ScatterGatherLimit; + #define BT958ExtendedSetupInfo_ScatterGatherLimit_SIZE sizeof(USHORT) + #define BT958ExtendedSetupInfo_ScatterGatherLimit_ID 3 + + // + UCHAR MailboxCount; + #define BT958ExtendedSetupInfo_MailboxCount_SIZE sizeof(UCHAR) + #define BT958ExtendedSetupInfo_MailboxCount_ID 4 + + // + ULONG BaseMailboxAddress; + #define BT958ExtendedSetupInfo_BaseMailboxAddress_SIZE sizeof(ULONG) + #define BT958ExtendedSetupInfo_BaseMailboxAddress_ID 5 + + // + BOOLEAN FastOnEISA; + #define BT958ExtendedSetupInfo_FastOnEISA_SIZE sizeof(BOOLEAN) + #define BT958ExtendedSetupInfo_FastOnEISA_ID 6 + + // + BOOLEAN LevelSensitiveInterrupt; + #define BT958ExtendedSetupInfo_LevelSensitiveInterrupt_SIZE sizeof(BOOLEAN) + #define BT958ExtendedSetupInfo_LevelSensitiveInterrupt_ID 7 + + // + UCHAR FirmwareRevision[3]; + #define BT958ExtendedSetupInfo_FirmwareRevision_SIZE sizeof(UCHAR[3]) + #define BT958ExtendedSetupInfo_FirmwareRevision_ID 8 + + // + BOOLEAN HostWideSCSI; + #define BT958ExtendedSetupInfo_HostWideSCSI_SIZE sizeof(BOOLEAN) + #define BT958ExtendedSetupInfo_HostWideSCSI_ID 9 + + // + BOOLEAN HostDifferentialSCSI; + #define BT958ExtendedSetupInfo_HostDifferentialSCSI_SIZE sizeof(BOOLEAN) + #define BT958ExtendedSetupInfo_HostDifferentialSCSI_ID 10 + + // + BOOLEAN HostSupportsSCAM; + #define BT958ExtendedSetupInfo_HostSupportsSCAM_SIZE sizeof(BOOLEAN) + #define BT958ExtendedSetupInfo_HostSupportsSCAM_ID 11 + + // + BOOLEAN HostUltraSCSI; + #define BT958ExtendedSetupInfo_HostUltraSCSI_SIZE sizeof(BOOLEAN) + #define BT958ExtendedSetupInfo_HostUltraSCSI_ID 12 + + // + BOOLEAN HostSmartTermination; + #define BT958ExtendedSetupInfo_HostSmartTermination_SIZE sizeof(BOOLEAN) + #define BT958ExtendedSetupInfo_HostSmartTermination_ID 13 + +} BT958ExtendedSetupInfo, *PBT958ExtendedSetupInfo; + +#endif Property changes on: vendor/VMware/buslogic/current/BT958dt.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/VMware/buslogic/current/BusLogic958.c --- vendor/VMware/buslogic/current/BusLogic958.c 2005-08-18 21:25:04 UTC (rev 17431) +++ vendor/VMware/buslogic/current/BusLogic958.c 2005-08-18 21:36:35 UTC (rev 17432) @@ -0,0 +1,2743 @@ +/* + * vmscsi-- Miniport driver for the Buslogic BT 958 SCSI Controller + * under Windows 2000/XP/Server 2003 + * + * Based in parts on the buslogic driver for the same device + * available with the GNU Linux Operating System. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +//_____________________________________________________________________ _______________ +// +// File description :The driver for BusLogic-BT958 SCSI Host adapter card. +// This driver assumes that the host adapter(HA from now on) is a PCI device. +// This is an effort to build a driver for this card for the windows XP ennvironment +// since the native XP installation doesnt provide this driver. +// +// The technical refernece for this device is at : +// +// Author: Namita Lal, Sirish Raghuram Calsoft Pvt Ltd +// Date: 5th Feb 2003 +// Status: Driver version 1.2.0.0 +// Performance tuned +// Correctness tested for +// 1. Installation at OS install time +// 2. Installation in an installed OS +// 3. Installation by upgrading a previous version +// on all flavours of WinXP and Win Server 2003 +// For Win2k however, please refer PR 22812 +/* +Revision History: +v1.0.0.4 // Pre final release to VMware in Sep 2001, without WMI + | + | + v +v1.0.0.5 // Sep 2001 release to VMware, with WMI + | + | + v +v1.0.0.6 // Fix for bug with Nero Burning ROM in XP + | // where SCSI_AUTO_SENSE is turned off at times + | + | + |---------> v1.1.0.0 // Performance optimizations: + | | // A. WMI disabled, B. Queueing depth increased + | | // C. Control flow changed (bug) + | | + | v + | v1.1.0.1 // Fix for .NET restart freeze with 1.1.0.0 + | // Breaks on XP + | + v +v1.2.0.0 // A. WMI disabled, B. Queueing depth increased + // CURRENT VERSION +*/ +//_____________________________________________________________________ _______________ + +#include "BusLogic958.h" + +ULONG +DriverEntry(IN PVOID DriverObject, + IN PVOID Argument2 + ) +//_____________________________________________________________________ ____ +// Routine Description: +// Installable driver initialization entry point for system. +// Arguments: +// Driver Object +// Return Value: +// Status from ScsiPortInitialize() +//_____________________________________________________________________ ____ +{ + HW_INITIALIZATION_DATA hwInitializationData; + ULONG Status; + ULONG i; + ULONG HwContext; + static int cardNo = 0; + + UCHAR VendorId[4] = { '1', '0', '4', 'b' }; + UCHAR DeviceId[4] = { '1', '0', '4', '0' }; + + DebugPrint((0,"\n BusLogic - Inside the DriverEntry function \n")); + + // Zero out structure. + for (i = 0; i < sizeof(HW_INITIALIZATION_DATA); i++) + { + ((PUCHAR) & hwInitializationData)[i] = 0; + } + + // Set size of hwInitializationData. + hwInitializationData.HwInitializationDataSize = sizeof(HW_INITIALIZATION_DATA); + + // Set entry points. + hwInitializationData.HwInitialize = BT958HwInitialize; + hwInitializationData.HwResetBus = BT958HwResetBus; + hwInitializationData.HwStartIo = BT958HwStartIO; + hwInitializationData.HwInterrupt = BT958HwInterrupt; + hwInitializationData.HwAdapterControl = BT958HwAdapterControl; + hwInitializationData.HwFindAdapter = BT958HwFindAdapter; + + // Inidicate no buffer mapping but will need physical addresses + hwInitializationData.NeedPhysicalAddresses = TRUE; + + // Indicate Auto request sense is supported + hwInitializationData.AutoRequestSense = TRUE; + hwInitializationData.MultipleRequestPerLu = TRUE; + +#if TAG_QUEUING + hwInitializationData.TaggedQueuing = TRUE; +#else + hwInitializationData.TaggedQueuing = FALSE; +#endif + + hwInitializationData.AdapterInterfaceType = PCIBus; + + // Fill in the vendor id and the device id + hwInitializationData.VendorId = &VendorId; + hwInitializationData.VendorIdLength = 4; + hwInitializationData.DeviceId = &DeviceId; + hwInitializationData.DeviceIdLength = 4; + + + hwInitializationData.NumberOfAccessRanges = 2; + + + // Specify size of extensions. + hwInitializationData.DeviceExtensionSize = sizeof(HW_DEVICE_EXTENSION); + + // logical unit extension + hwInitializationData.SrbExtensionSize = sizeof(BusLogic_CCB_T); + + HwContext = 0; + + DebugPrint((0,"\n BusLogic - Calling the ScsiPortInitialize Routine\n")); + + Status = ScsiPortInitialize(DriverObject, + Argument2, + &hwInitializationData, + &HwContext); + + DebugPrint((0,"\n BusLogic - Exiting the DriverEntry function \n")); + DebugPrint((0,"\n BusLogic - Status = %ul \n", Status)); + return( Status ); + +} // end DriverEntry() + + +ULONG +BT958HwFindAdapter(IN PVOID HwDeviceExtension, + IN PVOID Context, + IN PVOID BusInformation, + IN PCHAR ArgumentString, + IN OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo, + OUT PBOOLEAN Again + ) +//_____________________________________________________________________ ____________________________ +// Routine Description: +// This function is called by the OS-specific port driver after the necessary storage +// has been allocated, to gather information about the adapter's configuration. +// +// Arguments: +// HwDeviceExtension - HBA miniport driver's adapter data storage +// Context - Register base address +// ConfigInfo - Configuration information structure describing HBA +// This structure is defined in PORT.H. +// +// Return Value: +// HwScsiFindAdapter must return one of the following status values: +// SP_RETURN_FOUND: Indicates a supported HBA was found and that the HBA-relevant +// configuration information was successfully determined and set in +// the PORT_CONFIGURATION_INFORMATION structure. +// SP_RETURN_ERROR: Indicates an HBA was found but there was error obtaining the +// configuration information. If possible, such an error should be +// logged with ScsiPortLogError. +// SP_RETURN_BAD_CONFIG: Indicates the supplied configuration information was invalid +// for the adapter. +// SP_RETURN_NOT_FOUND: Indicates no supported HBA was found for the supplied +// configuration information. +//_____________________________________________________________________ ___________________________ +{ + PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension; + BusLogic_HostAdapter_T *hcsp = &(deviceExtension->hcs); + static UCHAR k = 0; + PACCESS_RANGE accessRange; + PCI_COMMON_CONFIG PCICommonConfig; + PUCHAR pciAddress, portFound; + char NumPort = 0; + + DebugPrint((0,"\n BusLogic - Inside the Find Adapter Routine\n")); + + *Again = FALSE; + + accessRange = &((*(ConfigInfo->AccessRanges))[0]); + + // Inform SCSIPORT that we are NOT a WMI data provider + // Sirish, 10th June 2002 + ConfigInfo->WmiDataProvider = FALSE; + /*Sirish, 10th June 2002 BT958WmiInitialize(deviceExtension);*/ + + // Check for configuration information passed in form the system + if ((*ConfigInfo->AccessRanges)[0].RangeLength != 0) + { + // check if the system supplied bus-relative address is valid and has not been + // claimed by anyother device + if ( ScsiPortValidateRange(deviceExtension, + ConfigInfo->AdapterInterfaceType, + ConfigInfo->SystemIoBusNumber, + accessRange->RangeStart, + accessRange->RangeLength, + TRUE) ) // TRUE: iniospace + { + DebugPrint((0,"\n BusLogic - BusLogic - Validate Range function suceeded \n")); + + // Map the Bus-relative range addresses to system-space logical range addresses + // so that these mapped logical addresses can be called with SciPortRead/Writexxx + // to determine whether the adapter is an HBA that the driver supports + + pciAddress = (PUCHAR) ScsiPortGetDeviceBase(deviceExtension, + ConfigInfo->AdapterInterfaceType, + ConfigInfo->SystemIoBusNumber, + accessRange->RangeStart, + accessRange->RangeLength, + TRUE); // TRUE: iniospace + + if(pciAddress) + { + DebugPrint((0,"\n BusLogic - Get Device Base function suceeded \n")); + + memset(hcsp, 0, sizeof(BusLogic_HostAdapter_T)); + + // points to structure of type BT958_HA which has device specific information. This needs + // to be either changed or modified with our specific info. + hcsp->IO_Address = pciAddress; + hcsp->IRQ_Channel = (UCHAR)ConfigInfo->BusInterruptLevel; + NumPort++; + } + } + } + + if (NumPort == 0) + { + return(SP_RETURN_NOT_FOUND); + } + + // Hardware found, let's find out hardware configuration + // and fill out ConfigInfo table for WinNT + ConfigInfo->NumberOfBuses = 1; + ConfigInfo->MaximumTransferLength = MAX_TRANSFER_SIZE; + +#if SG_SUPPORT + ConfigInfo->ScatterGather = TRUE; +#else + ConfigInfo->ScatterGather = FALSE; +#endif + + ConfigInfo->Master = TRUE; + ConfigInfo->NeedPhysicalAddresses = TRUE; + ConfigInfo->Dma32BitAddresses = TRUE; + ConfigInfo->InterruptMode = LevelSensitive; + +#if TAG_QUEUING + ConfigInfo->TaggedQueuing = TRUE; +#else + ConfigInfo->TaggedQueuing = FALSE; +#endif + + // Should we change this to double-word aligned to increase performance + ConfigInfo->AlignmentMask = 0x0; + + portFound = hcsp->IO_Address; + + if (!Buslogic_InitBT958(deviceExtension,ConfigInfo)) // harware specific initializations. Find what's for our card + { + ScsiPortLogError(deviceExtension, + NULL, + 0, + 0, + 0, + SP_INTERNAL_ADAPTER_ERROR, + 7 << 8); + + return(SP_RETURN_ERROR); + } + + if (NumPort != 0) + *Again = TRUE; + + return(SP_RETURN_FOUND); + +} // end BT958FindAdapter() + + +BOOLEAN +Buslogic_InitBT958(PHW_DEVICE_EXTENSION deviceExtension, + PPORT_CONFIGURATION_INFORMATION ConfigInfo) +//_____________________________________________________________________ ____ +// Routine Description: +// This routine is called from the driver's FindAdapter routine +// On invocation this routine probes the host adapter to check +// if its hardware registers are responding correctly, and +// initializes the device and makes it ready for IO +// Arguments: +// 1. deviceExtension +// 2. Port Configuration info +// Return Value: +// TRUE : Device initialized properly +// FALSE : Device failed to initialize +//_____________________________________________________________________ ____ +{ + + BusLogic_HostAdapter_T *HostAdapter = &(deviceExtension->hcs); + + // Probe the Host Adapter. + // If unsuccessful, abort further initialization. + if (!BusLogic_ProbeHostAdapter(HostAdapter)) + return FALSE; + + // Hard Reset the Host Adapter. + // If unsuccessful, abort further initialization. + if (!BusLogic_HardwareResetHostAdapter(HostAdapter, TRUE)) + return FALSE; + + // Check the Host Adapter. + // If unsuccessful, abort further initialization. + if (!BusLogic_CheckHostAdapter(HostAdapter)) + return FALSE; + + // Allocate a Noncached Extension to use for mail boxes. + deviceExtension->NoncachedExtension = ScsiPortGetUncachedExtension(deviceExtension, + ConfigInfo, + sizeof(NONCACHED_EXTENSION)); + + if (deviceExtension->NoncachedExtension == NULL) + { + // Log error. + ScsiPortLogError(deviceExtension, + NULL, + 0, + 0, + 0, + SP_INTERNAL_ADAPTER_ERROR, + 7 << 8); + + // abort further initialization + return FALSE; + } + + // Read the Host Adapter Configuration, Configure the Host Adapter, + // Acquire the System Resources necessary to use the Host Adapter, then + // Create the Initial CCBs, Initialize the Host Adapter, and finally + // perform Target Device Inquiry. + if (BusLogic_ReadHostAdapterConfiguration(HostAdapter) && + //BusLogic_ReportHostAdapterConfiguration(HostAdapter) && + BusLogic_InitializeHostAdapter(deviceExtension, ConfigInfo) && + BusLogic_TargetDeviceInquiry(HostAdapter)) + { + // Fill in the: + // 1.Maximum number of scsi target devices that are supported by our adapter + ConfigInfo->MaximumNumberOfTargets = HostAdapter->MaxTargetDevices; + // 2. Maximum number of logical units per target the HBA can control. + ConfigInfo->MaximumNumberOfLogicalUnits = HostAdapter->MaxLogicalUnits; + ConfigInfo->InitiatorBusId[0] = HostAdapter->SCSI_ID; + // Maximum number of breaks between address ranges that a data buffer can + // have if the HBA supports scatter/gather. In other words, the number of + // scatter/gather lists minus one. + ConfigInfo->NumberOfPhysicalBreaks = HostAdapter->DriverScatterGatherLimit; + } + else + { + // An error occurred during Host Adapter Configuration Querying, Host + // Adapter Configuration, Host Adapter Initialization, or Target Device Inquiry, + // so return FALSE + + return FALSE; + } + // Initialization completed successfully + return TRUE; +} // end Buslogic_InitBT958 + + +BOOLEAN +BusLogic_ProbeHostAdapter(BusLogic_HostAdapter_T *HostAdapter) +//_____________________________________________________________________ _______________ +// Routine Description: BusLogic_ProbeHostAdapter probes for a BusLogic Host Adapter. +// The routine reads the status, interrupt and geometry regiter and +// checks if their contents are valid +// Arguments: +// 1. Host Adapter structure +// +// Return Value: +// TRUE: Probe completed successfully +// FALSE: Probe failed +//_____________________________________________________________________ _______________ +{ + BusLogic_StatusRegister_T StatusRegister; + BusLogic_InterruptRegister_T InterruptRegister; + BusLogic_GeometryRegister_T GeometryRegister; + + DebugPrint((0,"\n BusLogic - Inside ProbeHostaAdapter funtion \n")); + // Read the Status, Interrupt, and Geometry Registers to test if there are I/O + // ports that respond, and to check the values to determine if they are from a + // BusLogic Host Adapter. A nonexistent I/O port will return 0xFF, in which + // case there is definitely no BusLogic Host Adapter at this base I/O Address. + // The test here is a subset of that used by the BusLogic Host Adapter BIOS. + + InterruptRegister.All = BusLogic_ReadInterruptRegister(HostAdapter); + GeometryRegister.All = BusLogic_ReadGeometryRegister(HostAdapter); + StatusRegister.All = BusLogic_ReadStatusRegister(HostAdapter); + + if (StatusRegister.All == 0 || + StatusRegister.Bits.DiagnosticActive || + StatusRegister.Bits.CommandParameterRegisterBusy || + StatusRegister.Bits.Reserved || + StatusRegister.Bits.CommandInvalid || + InterruptRegister.Bits.Reserved != 0) + return FALSE; + + // Check the undocumented Geometry Register to test if there is an I/O port + // that responded. Adaptec Host Adapters do not implement the Geometry + // Register, so this test helps serve to avoid incorrectly recognizing an + // Adaptec 1542A or 1542B as a BusLogic. Unfortunately, the Adaptec 1542C + // series does respond to the Geometry Register I/O port, but it will be + // rejected later when the Inquire Extended Setup Information command is + // issued in BusLogic_CheckHostAdapter. The AMI FastDisk Host Adapter is a + // BusLogic clone that implements the same interface as earlier BusLogic + // Host Adapters, including the undocumented commands, and is therefore + // supported by this driver. However, the AMI FastDisk always returns 0x00 + // upon reading the Geometry Register, so the extended translation option + // should always be left disabled on the AMI FastDisk. + + if (GeometryRegister.All == 0xFF) return FALSE; + return TRUE; +}// end BusLogic_ProbeHostAdapter + +BOOLEAN +BusLogic_HardwareResetHostAdapter(BusLogic_HostAdapter_T *HostAdapter, + BOOLEAN HardReset) +//_____________________________________________________________________ ____ +// Routine Description: BusLogic_HardwareResetHostAdapter issues a Hardware +// Reset to the Host Adapter and waits for Host Adapter +// Diagnostics to complete. If HardReset is TRUE, a +// Hard Reset is performed which also initiates a SCSI +// Bus Reset. Otherwise, a Soft Reset is performed which +// only resets the Host Adapter without forcing a SCSI +// Bus Reset. +// Arguments: +// 1. Host Adapter structure +// 2. Boolean HardReset - True: Do hard reset +// Return Value: +// TRUE : Reset completed successfully +// FALSE : Reset failed +//_____________________________________________________________________ ____ +{ + BusLogic_StatusRegister_T StatusRegister; + int TimeoutCounter; + + // Issue a Hard Reset or Soft Reset Command to the Host Adapter. The Host + // Adapter should respond by setting Diagnostic Active in the Status Register. + if (HardReset) + BusLogic_HardReset(HostAdapter); + else + BusLogic_SoftReset(HostAdapter); + + // Wait until Diagnostic Active is set in the Status Register. + TimeoutCounter = 5*10000; + while (--TimeoutCounter >= 0) + { + StatusRegister.All = BusLogic_ReadStatusRegister(HostAdapter); + if (StatusRegister.Bits.DiagnosticActive) + break; + ScsiPortStallExecution(100); + } + + // if inspite of waiting for time out period , if it didn't et set, then something is wrong-- so just return. + if (TimeoutCounter < 0) + return FALSE; + + // + // Wait 100 microseconds to allow completion of any initial diagnostic + // activity which might leave the contents of the Status Register + // unpredictable. + ScsiPortStallExecution(100); + + // Wait until Diagnostic Active is reset in the Status Register. + TimeoutCounter = 10*10000; + while (--TimeoutCounter >= 0) + { + StatusRegister.All = BusLogic_ReadStatusRegister(HostAdapter); + if (!StatusRegister.Bits.DiagnosticActive) + break; + ScsiPortStallExecution(100); + } + + if (TimeoutCounter < 0) + return FALSE; + + // Wait until at least one of the Diagnostic Failure, Host Adapter Ready, + // or Data In Register Ready bits is set in the Status Register. + TimeoutCounter = 10000; + while (--TimeoutCounter >= 0) + { + StatusRegister.All = BusLogic_ReadStatusRegister(HostAdapter); + if (StatusRegister.Bits.DiagnosticFailure || + StatusRegister.Bits.HostAdapterReady || + StatusRegister.Bits.DataInRegisterReady) + { + break; + } + ScsiPortStallExecution(100); + } + + //device didn't respond to reset + if (TimeoutCounter < 0) + return FALSE; + + // If Diagnostic Failure is set or Host Adapter Ready is reset, then an + // error occurred during the Host Adapter diagnostics. If Data In Register + // Ready is set, then there is an Error Code available. + if (StatusRegister.Bits.DiagnosticFailure || !StatusRegister.Bits.HostAdapterReady) + { + DebugPrint((0,"Failure - HOST ADAPTER STATUS REGISTER = %02X\n", StatusRegister.All)); + + if (StatusRegister.Bits.DataInRegisterReady) + { + UCHAR ErrorCode = BusLogic_ReadDataInRegister(HostAdapter); + DebugPrint((0,"HOST ADAPTER ERROR CODE = %d\n", ErrorCode)); + } + return FALSE; + } + // Indicate the Host Adapter Hard Reset completed successfully. + return TRUE; +}// end BusLogic_HardwareResetHostAdapter + + +BOOLEAN +BusLogic_CheckHostAdapter(BusLogic_HostAdapter_T *HostAdapter) +//_____________________________________________________________________ ____ +// Routine Description: BusLogic_CheckHostAdapter checks to be sure this +// really is a BusLogic +// Arguments: +// 1. Host Adapter Structure +// Return Value: +// TRUE : Buslogic adapter detected +// FALSE : Card is not a Buslogic adapter +//_____________________________________________________________________ ____ +{ + BusLogic_ExtendedSetupInformation_T ExtendedSetupInformation; + BusLogic_RequestedReplyLength_T RequestedReplyLength; + BOOLEAN Result = TRUE; + + DebugPrint((0,"\n BusLogic - Inside BusLogic_CheckHostAdapter funtion \n")); + + // + // Issue the Inquire Extended Setup Information command. Only genuine + // BusLogic Host Adapters and TRUE clones support this command. Adaptec 1542C + // series Host Adapters that respond to the Geometry Register I/O port will + // fail this command. + RequestedReplyLength = sizeof(ExtendedSetupInformation); + if (BusLogic_Command(HostAdapter, + BusLogic_InquireExtendedSetupInformation, + &RequestedReplyLength, + sizeof(RequestedReplyLength), + &ExtendedSetupInformation, + sizeof(ExtendedSetupInformation)) + != sizeof(ExtendedSetupInformation)) + { + Result = FALSE; + } + return Result; +}// end BusLogic_CheckHostAdapter + +int +BusLogic_Command(BusLogic_HostAdapter_T *HostAdapter, + BusLogic_OperationCode_T OperationCode, + void *ParameterData, + int ParameterLength, + void *ReplyData, + int ReplyLength) +//_____________________________________________________________________ _________________________ +// Routine Description: +// BusLogic_Command sends the command OperationCode to HostAdapter, optionally +// providing ParameterLength bytes of ParameterData and receiving at most +// ReplyLength bytes of ReplyData; any excess reply data is received but +// discarded. +// +// BusLogic_Command is called exclusively during host adapter detection and +// initialization, so performance and latency are not critical, and exclusive +// access to the Host Adapter hardware is assumed. Once the host adapter and +// driver are initialized, the only Host Adapter command that is issued is the +// single byte Execute Mailbox Command operation code, which does not require +// waiting for the Host Adapter Ready bit to be set in the Status Register. +// Arguments: +// 1. HostAdapter - Host Adapter structure +// 2. OperationCode - Operation code for the command +// 3. ParameterData - Buffer containing parameters that needs to be passed as part +// of the command +// 4. ParameterLength - Number of parameters +// 5. ReplyData - Buffer where reply data is copied +// 6. ReplyLength - The length of the reply data +// Return Value: +// On success, this function returns the number of reply bytes read from +// the Host Adapter (including any discarded data); on failure, it returns +// -1 if the command was invalid, or -2 if a timeout occurred. +//_____________________________________________________________________ ____________________________ +{ + UCHAR *ParameterPointer = (UCHAR *) ParameterData; + UCHAR *ReplyPointer = (UCHAR *) ReplyData; + BusLogic_StatusRegister_T StatusRegister; + BusLogic_InterruptRegister_T InterruptRegister; + int ReplyBytes = 0, Result; + long TimeoutCounter; + + // Clear out the Reply Data if provided. + if (ReplyLength > 0) + memset(ReplyData, 0, ReplyLength); + + // If the IRQ Channel has not yet been acquired, then interrupts must be + // disabled while issuing host adapter commands since a Command Complete + // interrupt could occur if the IRQ Channel was previously enabled by another + // BusLogic Host Adapter or another driver sharing the same IRQ Channel. + + // Wait for the Host Adapter Ready bit to be set and the Command/Parameter + // Register Busy bit to be reset in the Status Register. + TimeoutCounter = 10000; + while (--TimeoutCounter >= 0) + { + StatusRegister.All = BusLogic_ReadStatusRegister(HostAdapter); + if ( StatusRegister.Bits.HostAdapterReady && + !StatusRegister.Bits.CommandParameterRegisterBusy) + { + break; + } + ScsiPortStallExecution(100); + } + if (TimeoutCounter < 0) + { + //BusLogic_CommandFailureReason = "Timeout waiting for Host Adapter Ready"; + Result = -2; + goto Done; + } + + // Write the OperationCode to the Command/Parameter Register. + HostAdapter->HostAdapterCommandCompleted = FALSE; + BusLogic_WriteCommandParameterRegister(HostAdapter, (UCHAR)OperationCode); + + //Write any additional Parameter Bytes. + TimeoutCounter = 10000; + while (ParameterLength > 0 && --TimeoutCounter >= 0) + { + // + // Wait 100 microseconds to give the Host Adapter enough time to determine + // whether the last value written to the Command/Parameter Register was + // valid or not. If the Command Complete bit is set in the Interrupt + // Register, then the Command Invalid bit in the Status Register will be + // reset if the Operation Code or Parameter was valid and the command + // has completed, or set if the Operation Code or Parameter was invalid. + // If the Data In Register Ready bit is set in the Status Register, then + // the Operation Code was valid, and data is waiting to be read back + // from the Host Adapter. Otherwise, wait for the Command/Parameter + // Register Busy bit in the Status Register to be reset. + + ScsiPortStallExecution(100); + InterruptRegister.All = BusLogic_ReadInterruptRegister(HostAdapter); + StatusRegister.All = BusLogic_ReadStatusRegister(HostAdapter); + if (InterruptRegister.Bits.CommandComplete) + break; + if (HostAdapter->HostAdapterCommandCompleted) + break; + if (StatusRegister.Bits.DataInRegisterReady) + break; + if (StatusRegister.Bits.CommandParameterRegisterBusy) + continue; + BusLogic_WriteCommandParameterRegister(HostAdapter, *ParameterPointer++); + ParameterLength--; + } + if (TimeoutCounter < 0) + { + //BusLogic_CommandFailureReason = "Timeout waiting for Parameter Acceptance"; + Result = -2; + goto Done; + } + + // The Modify I/O Address command does not cause a Command Complete Interrupt. + if (OperationCode == BusLogic_ModifyIOAddress) + { + StatusRegister.All = BusLogic_ReadStatusRegister(HostAdapter); + if (StatusRegister.Bits.CommandInvalid) + { + //BusLogic_CommandFailureReason = "Modify I/O Address Invalid"; + Result = -1; + goto Done; + } + Result = 0; + goto Done; + } + + // Select an appropriate timeout value for awaiting command completion. + switch (OperationCode) + { + case BusLogic_InquireInstalledDevicesID0to7: + case BusLogic_InquireInstalledDevicesID8to15: + case BusLogic_InquireTargetDevices: + // Approximately 60 seconds. + TimeoutCounter = 60*10000; + break; + default: + // Approximately 1 second. + TimeoutCounter = 10000; + break; + } + + // + // Receive any Reply Bytes, waiting for either the Command Complete bit to + // be set in the Interrupt Register, or for the Interrupt Handler to set the + // Host Adapter Command Completed bit in the Host Adapter structure. + while (--TimeoutCounter >= 0) + { + InterruptRegister.All = BusLogic_ReadInterruptRegister(HostAdapter); + StatusRegister.All = BusLogic_ReadStatusRegister(HostAdapter); + if (InterruptRegister.Bits.CommandComplete) + break; + if (HostAdapter->HostAdapterCommandCompleted) + break; + if (StatusRegister.Bits.DataInRegisterReady) + { + if (++ReplyBytes <= ReplyLength) + { + *ReplyPointer++ = BusLogic_ReadDataInRegister(HostAdapter); + } + else + { + BusLogic_ReadDataInRegister(HostAdapter); + } + } + if (OperationCode == BusLogic_FetchHostAdapterLocalRAM && + StatusRegister.Bits.HostAdapterReady) + { + break; + } + ScsiPortStallExecution(100); + } + if (TimeoutCounter < 0) + { + //BusLogic_CommandFailureReason = "Timeout waiting for Command Complete"; + Result = -2; + goto Done; + } + + // Clear any pending Command Complete Interrupt. + BusLogic_InterruptReset(HostAdapter); + + // Process Command Invalid conditions. + if (StatusRegister.Bits.CommandInvalid) + { + // + // Some early BusLogic Host Adapters may not recover properly from + // a Command Invalid condition, so if this appears to be the case, + // a Soft Reset is issued to the Host Adapter. Potentially invalid + // commands are never attempted after Mailbox Initialization is + // performed, so there should be no Host Adapter state lost by a + // Soft Reset in response to a Command Invalid condition. + + ScsiPortStallExecution(1000); + StatusRegister.All = BusLogic_ReadStatusRegister(HostAdapter); + if (StatusRegister.Bits.CommandInvalid || + StatusRegister.Bits.Reserved || + StatusRegister.Bits.DataInRegisterReady || + StatusRegister.Bits.CommandParameterRegisterBusy || + !StatusRegister.Bits.HostAdapterReady || + !StatusRegister.Bits.InitializationRequired || + StatusRegister.Bits.DiagnosticActive || + StatusRegister.Bits.DiagnosticFailure) + { + BusLogic_SoftReset(HostAdapter); + ScsiPortStallExecution(1000); + } + //BusLogic_CommandFailureReason = "Command Invalid"; + Result = -1; + goto Done; + } + + // Handle Excess Parameters Supplied conditions. + if (ParameterLength > 0) + { + //BusLogic_CommandFailureReason = "Excess Parameters Supplied"; + Result = -1; + goto Done; + } + + // Indicate the command completed successfully. + Result = ReplyBytes; + + // Restore the interrupt status if necessary and return. +Done: + return Result; +}// end BusLogic_Command + + +BOOLEAN +BusLogic_ReadHostAdapterConfiguration(BusLogic_HostAdapter_T *HostAdapter) +//_____________________________________________________________________ ______________________ +// Routine Description: +// BusLogic_ReadHostAdapterConfiguration reads the Configuration Information +// from Host Adapter and initializes the Host Adapter structure. +// Arguments: +// 1. Host adapter structure +// Return Value: +// TRUE : Configuration read properly +// FALSE : Encounter failure +//_____________________________________________________________________ ______________________ +{ + BusLogic_BoardID_T BoardID; + BusLogic_Configuration_T Configuration; + BusLogic_SetupInformation_T SetupInformation; + BusLogic_ExtendedSetupInformation_T ExtendedSetupInformation; + BusLogic_HostAdapterModelNumber_T HostAdapterModelNumber; + BusLogic_FirmwareVersion3rdDigit_T FirmwareVersion3rdDigit; + BusLogic_FirmwareVersionLetter_T FirmwareVersionLetter; + BusLogic_PCIHostAdapterInformation_T PCIHostAdapterInformation; + BusLogic_FetchHostAdapterLocalRAMRequest_T FetchHostAdapterLocalRAMRequest; + BusLogic_AutoSCSIData_T AutoSCSIData; [truncated at 1000 lines; 3858 more skipped]

19 years, 1 month

[ion] 17431: Fix boot

by ion＠svn.reactos.com

Fix boot Modified: trunk/reactos/include/subsys/csrss/csrss.h Modified: trunk/reactos/include/subsys/sm/api.h Modified: trunk/reactos/ntoskrnl/lpc/send.c _____ Modified: trunk/reactos/include/subsys/csrss/csrss.h --- trunk/reactos/include/subsys/csrss/csrss.h 2005-08-18 20:52:52 UTC (rev 17430) +++ trunk/reactos/include/subsys/csrss/csrss.h 2005-08-18 21:25:04 UTC (rev 17431) @@ -489,72 +489,76 @@ typedef struct _CSR_API_MESSAGE { - union - { - PORT_MESSAGE Header; - struct + union { - BYTE HeaderReserved[sizeof(PORT_MESSAGE)]; - ULONG Type; - NTSTATUS Status; - union - { - CSRSS_CREATE_PROCESS CreateProcessRequest; - CSRSS_CONNECT_PROCESS ConnectRequest; - CSRSS_WRITE_CONSOLE WriteConsoleRequest; - CSRSS_READ_CONSOLE ReadConsoleRequest; - CSRSS_ALLOC_CONSOLE AllocConsoleRequest; - CSRSS_SCREEN_BUFFER_INFO ScreenBufferInfoRequest; - CSRSS_SET_CURSOR SetCursorRequest; - CSRSS_FILL_OUTPUT FillOutputRequest; - CSRSS_READ_INPUT ReadInputRequest; - CSRSS_WRITE_CONSOLE_OUTPUT_CHAR WriteConsoleOutputCharRequest; - CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB WriteConsoleOutputAttribRequest; - CSRSS_FILL_OUTPUT_ATTRIB FillOutputAttribRequest; - CSRSS_SET_CURSOR_INFO SetCursorInfoRequest; - CSRSS_GET_CURSOR_INFO GetCursorInfoRequest; - CSRSS_SET_ATTRIB SetAttribRequest; - CSRSS_SET_CONSOLE_MODE SetConsoleModeRequest; - CSRSS_GET_CONSOLE_MODE GetConsoleModeRequest; - CSRSS_CREATE_SCREEN_BUFFER CreateScreenBufferRequest; - CSRSS_SET_SCREEN_BUFFER SetScreenBufferRequest; - CSRSS_SET_TITLE SetTitleRequest; - CSRSS_GET_TITLE GetTitleRequest; - CSRSS_WRITE_CONSOLE_OUTPUT WriteConsoleOutputRequest; - CSRSS_FLUSH_INPUT_BUFFER FlushInputBufferRequest; - CSRSS_SCROLL_CONSOLE_SCREEN_BUFFER ScrollConsoleScreenBufferRequest; - CSRSS_READ_CONSOLE_OUTPUT_CHAR ReadConsoleOutputCharRequest; - CSRSS_READ_CONSOLE_OUTPUT_ATTRIB ReadConsoleOutputAttribRequest; - CSRSS_GET_NUM_INPUT_EVENTS GetNumInputEventsRequest; - CSRSS_REGISTER_SERVICES_PROCESS RegisterServicesProcessRequest; - CSRSS_EXIT_REACTOS ExitReactosRequest; - CSRSS_SET_SHUTDOWN_PARAMETERS SetShutdownParametersRequest; - CSRSS_GET_SHUTDOWN_PARAMETERS GetShutdownParametersRequest; - CSRSS_PEEK_CONSOLE_INPUT PeekConsoleInputRequest; - CSRSS_READ_CONSOLE_OUTPUT ReadConsoleOutputRequest; - CSRSS_WRITE_CONSOLE_INPUT WriteConsoleInputRequest; - CSRSS_GET_INPUT_HANDLE GetInputHandleRequest; - CSRSS_GET_OUTPUT_HANDLE GetOutputHandleRequest; - CSRSS_CLOSE_HANDLE CloseHandleRequest; - CSRSS_VERIFY_HANDLE VerifyHandleRequest; - CSRSS_DUPLICATE_HANDLE DuplicateHandleRequest; - CSRSS_SETGET_CONSOLE_HW_STATE ConsoleHardwareStateRequest; - CSRSS_GET_CONSOLE_WINDOW GetConsoleWindowRequest; - CSRSS_CREATE_DESKTOP CreateDesktopRequest; - CSRSS_SHOW_DESKTOP ShowDesktopRequest; - CSRSS_HIDE_DESKTOP HideDesktopRequest; - CSRSS_SET_CONSOLE_ICON SetConsoleIconRequest; - CSRSS_SET_LOGON_NOTIFY_WINDOW SetLogonNotifyWindowRequest; - CSRSS_REGISTER_LOGON_PROCESS RegisterLogonProcessRequest; - CSRSS_GET_CONSOLE_CP GetConsoleCodePage; - CSRSS_SET_CONSOLE_CP SetConsoleCodePage; - CSRSS_GET_CONSOLE_OUTPUT_CP GetConsoleOutputCodePage; - CSRSS_SET_CONSOLE_OUTPUT_CP SetConsoleOutputCodePage; - CSRSS_GET_INPUT_WAIT_HANDLE GetConsoleInputWaitHandle; - CSRSS_GET_PROCESS_LIST GetProcessListRequest; - } Data; + PORT_MESSAGE Header; + union + { + struct + { + BYTE HeaderReserved[sizeof(PORT_MESSAGE)]; + ULONG Type; + NTSTATUS Status; + union + { + CSRSS_CREATE_PROCESS CreateProcessRequest; + CSRSS_CONNECT_PROCESS ConnectRequest; + CSRSS_WRITE_CONSOLE WriteConsoleRequest; + CSRSS_READ_CONSOLE ReadConsoleRequest; + CSRSS_ALLOC_CONSOLE AllocConsoleRequest; + CSRSS_SCREEN_BUFFER_INFO ScreenBufferInfoRequest; + CSRSS_SET_CURSOR SetCursorRequest; + CSRSS_FILL_OUTPUT FillOutputRequest; + CSRSS_READ_INPUT ReadInputRequest; + CSRSS_WRITE_CONSOLE_OUTPUT_CHAR WriteConsoleOutputCharRequest; + CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB WriteConsoleOutputAttribRequest; + CSRSS_FILL_OUTPUT_ATTRIB FillOutputAttribRequest; + CSRSS_SET_CURSOR_INFO SetCursorInfoRequest; + CSRSS_GET_CURSOR_INFO GetCursorInfoRequest; + CSRSS_SET_ATTRIB SetAttribRequest; + CSRSS_SET_CONSOLE_MODE SetConsoleModeRequest; + CSRSS_GET_CONSOLE_MODE GetConsoleModeRequest; + CSRSS_CREATE_SCREEN_BUFFER CreateScreenBufferRequest; + CSRSS_SET_SCREEN_BUFFER SetScreenBufferRequest; + CSRSS_SET_TITLE SetTitleRequest; + CSRSS_GET_TITLE GetTitleRequest; + CSRSS_WRITE_CONSOLE_OUTPUT WriteConsoleOutputRequest; + CSRSS_FLUSH_INPUT_BUFFER FlushInputBufferRequest; + CSRSS_SCROLL_CONSOLE_SCREEN_BUFFER ScrollConsoleScreenBufferRequest; + CSRSS_READ_CONSOLE_OUTPUT_CHAR ReadConsoleOutputCharRequest; + CSRSS_READ_CONSOLE_OUTPUT_ATTRIB ReadConsoleOutputAttribRequest; + CSRSS_GET_NUM_INPUT_EVENTS GetNumInputEventsRequest; + CSRSS_REGISTER_SERVICES_PROCESS RegisterServicesProcessRequest; + CSRSS_EXIT_REACTOS ExitReactosRequest; + CSRSS_SET_SHUTDOWN_PARAMETERS SetShutdownParametersRequest; + CSRSS_GET_SHUTDOWN_PARAMETERS GetShutdownParametersRequest; + CSRSS_PEEK_CONSOLE_INPUT PeekConsoleInputRequest; + CSRSS_READ_CONSOLE_OUTPUT ReadConsoleOutputRequest; + CSRSS_WRITE_CONSOLE_INPUT WriteConsoleInputRequest; + CSRSS_GET_INPUT_HANDLE GetInputHandleRequest; + CSRSS_GET_OUTPUT_HANDLE GetOutputHandleRequest; + CSRSS_CLOSE_HANDLE CloseHandleRequest; + CSRSS_VERIFY_HANDLE VerifyHandleRequest; + CSRSS_DUPLICATE_HANDLE DuplicateHandleRequest; + CSRSS_SETGET_CONSOLE_HW_STATE ConsoleHardwareStateRequest; + CSRSS_GET_CONSOLE_WINDOW GetConsoleWindowRequest; + CSRSS_CREATE_DESKTOP CreateDesktopRequest; + CSRSS_SHOW_DESKTOP ShowDesktopRequest; + CSRSS_HIDE_DESKTOP HideDesktopRequest; + CSRSS_SET_CONSOLE_ICON SetConsoleIconRequest; + CSRSS_SET_LOGON_NOTIFY_WINDOW SetLogonNotifyWindowRequest; + CSRSS_REGISTER_LOGON_PROCESS RegisterLogonProcessRequest; + CSRSS_GET_CONSOLE_CP GetConsoleCodePage; + CSRSS_SET_CONSOLE_CP SetConsoleCodePage; + CSRSS_GET_CONSOLE_OUTPUT_CP GetConsoleOutputCodePage; + CSRSS_SET_CONSOLE_OUTPUT_CP SetConsoleOutputCodePage; + CSRSS_GET_INPUT_WAIT_HANDLE GetConsoleInputWaitHandle; + CSRSS_GET_PROCESS_LIST GetProcessListRequest; + } Data; + }; + UCHAR PadBuffer[PORT_MAXIMUM_MESSAGE_LENGTH]; + }; }; - }; } CSR_API_MESSAGE, *PCSR_API_MESSAGE; #endif /* __INCLUDE_CSRSS_CSRSS_H */ _____ Modified: trunk/reactos/include/subsys/sm/api.h --- trunk/reactos/include/subsys/sm/api.h 2005-08-18 20:52:52 UTC (rev 17430) +++ trunk/reactos/include/subsys/sm/api.h 2005-08-18 21:25:04 UTC (rev 17431) @@ -109,29 +109,38 @@ typedef union _SM_PORT_MESSAGE { - /*** LPC common header ***/ - PORT_MESSAGE Header; - struct { - UCHAR LpcHeader[sizeof(PORT_MESSAGE)]; - /*** SM common header ***/ - struct { - DWORD ApiIndex; - NTSTATUS Status; - } SmHeader; - /*** SM per API arguments ***/ - union { - union { - SM_PORT_MESSAGE_COMPSES CompSes; - SM_PORT_MESSAGE_EXECPGM ExecPgm; - SM_PORT_MESSAGE_QRYINFO QryInfo; - } Request; - union { - SM_PORT_MESSAGE_COMPSES CompSes; - SM_PORT_MESSAGE_EXECPGM ExecPgm; - SM_PORT_MESSAGE_QRYINFO QryInfo; - } Reply; + /*** LPC common header ***/ + PORT_MESSAGE Header; + union + { + struct + { + UCHAR LpcHeader[sizeof(PORT_MESSAGE)]; + /*** SM common header ***/ + struct + { + DWORD ApiIndex; + NTSTATUS Status; + } SmHeader; + /*** SM per API arguments ***/ + union + { + union + { + SM_PORT_MESSAGE_COMPSES CompSes; + SM_PORT_MESSAGE_EXECPGM ExecPgm; + SM_PORT_MESSAGE_QRYINFO QryInfo; + } Request; + union + { + SM_PORT_MESSAGE_COMPSES CompSes; + SM_PORT_MESSAGE_EXECPGM ExecPgm; + SM_PORT_MESSAGE_QRYINFO QryInfo; + } Reply; + }; + }; + UCHAR PadBuffer[PORT_MAXIMUM_MESSAGE_LENGTH]; }; - }; } SM_PORT_MESSAGE, * PSM_PORT_MESSAGE; #include <poppack.h> _____ Modified: trunk/reactos/ntoskrnl/lpc/send.c --- trunk/reactos/ntoskrnl/lpc/send.c 2005-08-18 20:52:52 UTC (rev 17430) +++ trunk/reactos/ntoskrnl/lpc/send.c 2005-08-18 21:25:04 UTC (rev 17431) @@ -357,7 +357,7 @@ ObDereferenceObject(Port); return(STATUS_PORT_MESSAGE_TOO_LONG); } - if (LpcRequestDataSize != (LpcRequestMessageSize - sizeof(PORT_MESSAGE))) + if (LpcRequestDataSize > LPC_MAX_DATA_LENGTH) { ExFreePool(LpcRequest); if (NULL != AttachedProcess)

19 years, 1 month

[greatlrd] 17430: implement errorlevel in some cmd command and bug fix some errorlevel command. Hopply it is last commit about errorlevel. Please can some test see if all cmd command have right errorlevel set or not set. I have not test every command if they got right errorlevel setting. But They should have it now.

by greatlrd＠svn.reactos.com

implement errorlevel in some cmd command and bug fix some errorlevel command. Hopply it is last commit about errorlevel. Please can some test see if all cmd command have right errorlevel set or not set. I have not test every command if they got right errorlevel setting. But They should have it now. Modified: trunk/reactos/subsys/system/cmd/alias.c Modified: trunk/reactos/subsys/system/cmd/call.c Modified: trunk/reactos/subsys/system/cmd/chcp.c Modified: trunk/reactos/subsys/system/cmd/color.c Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/del.c Modified: trunk/reactos/subsys/system/cmd/delay.c Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/dirstack.c Modified: trunk/reactos/subsys/system/cmd/move.c Modified: trunk/reactos/subsys/system/cmd/path.c Modified: trunk/reactos/subsys/system/cmd/ren.c Modified: trunk/reactos/subsys/system/cmd/screen.c Modified: trunk/reactos/subsys/system/cmd/set.c Modified: trunk/reactos/subsys/system/cmd/shift.c Modified: trunk/reactos/subsys/system/cmd/start.c Modified: trunk/reactos/subsys/system/cmd/timer.c Modified: trunk/reactos/subsys/system/cmd/type.c Modified: trunk/reactos/subsys/system/cmd/vol.c _____ Modified: trunk/reactos/subsys/system/cmd/alias.c --- trunk/reactos/subsys/system/cmd/alias.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/alias.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -320,9 +320,14 @@ return 0; } + nErrorLevel = 0; + /* error if no '=' found */ if ((ptr = _tcschr (param, _T('='))) == 0) + { + nErrorLevel = 1; return 1; + } /* Split rest into name and substitute */ *ptr++ = _T('\0'); _____ Modified: trunk/reactos/subsys/system/cmd/call.c --- trunk/reactos/subsys/system/cmd/call.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/call.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -54,7 +54,7 @@ return 0; } - nErrorLevel = 1; + nErrorLevel = 0; n = (LPBATCH_CONTEXT)malloc (sizeof (BATCH_CONTEXT)); _____ Modified: trunk/reactos/subsys/system/cmd/chcp.c --- trunk/reactos/subsys/system/cmd/chcp.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/chcp.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -31,6 +31,8 @@ ConOutResPaging(TRUE,STRING_CHCP_HELP); return 0; } + + nErrorLevel = 0; /* get parameters */ arg = split (param, &args, FALSE); @@ -48,6 +50,7 @@ /* too many parameters */ LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_PARAM_FORMAT, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, param); + nErrorLevel = 1; return 1; } @@ -58,6 +61,7 @@ LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_PARAM_FORMAT, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, arg[0]); freep (arg); + nErrorLevel = 1; return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/color.c --- trunk/reactos/subsys/system/cmd/color.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/color.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -74,6 +74,8 @@ return 0; } + nErrorLevel = 0; + if (rest[0] == _T('\0')) { /* set default color */ @@ -101,12 +103,14 @@ return 0; } ConErrResPuts(STRING_COLOR_ERROR2); + nErrorLevel = 1; return 1; } if (StringToColor(&wColor, &rest) == FALSE) { ConErrResPuts(STRING_COLOR_ERROR2); + nErrorLevel = 1; return 1; } @@ -117,6 +121,7 @@ { LoadString(CMD_ModuleHandle, STRING_COLOR_ERROR4, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, wColor); + nErrorLevel = 1; return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -80,7 +80,7 @@ { LoadString(CMD_ModuleHandle, STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(szMsg, source); - nErrorLevel = 1; + nErrorLevel = 1; return 0; } @@ -92,6 +92,7 @@ if(SetFileTime(hFileSrc,(LPFILETIME) NULL, (LPFILETIME) NULL, &NewFileTime)) { CloseHandle(hFileSrc); + nErrorLevel = 1; return 1; } @@ -110,7 +111,7 @@ { LoadString(CMD_ModuleHandle, STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(szMsg, source); - nErrorLevel = 1; + nErrorLevel = 1; return 0; } @@ -178,7 +179,7 @@ ConOutPrintf(szMsg, source); CloseHandle (hFileSrc); - nErrorLevel = 1; + nErrorLevel = 1; return 0; } @@ -221,7 +222,7 @@ { CloseHandle (hFileSrc); ConOutResPuts(STRING_ERROR_PATH_NOT_FOUND); - nErrorLevel = 1; + nErrorLevel = 1; return 0; } buffer = (LPBYTE)malloc (BUFF_SIZE); @@ -230,7 +231,7 @@ CloseHandle (hFileDest); CloseHandle (hFileSrc); ConOutResPuts(STRING_ERROR_OUT_OF_MEMORY); - nErrorLevel = 1; + nErrorLevel = 1; return 0; } @@ -504,9 +505,9 @@ default: /* invaild switch */ - LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_SWITCH, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, _totupper(arg[i][1])); - + LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_SWITCH, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg, _totupper(arg[i][1])); + nErrorLevel = 1; return 1; break; } @@ -555,9 +556,9 @@ if(nFiles > 2) { /* there is too many file names in command */ - LoadString(CMD_ModuleHandle, STRING_ERROR_TOO_MANY_PARAMETERS, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg,_T("")); - nErrorLevel = 1; + LoadString(CMD_ModuleHandle, STRING_ERROR_TOO_MANY_PARAMETERS, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg,_T("")); + nErrorLevel = 1; freep (arg); return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/del.c --- trunk/reactos/subsys/system/cmd/del.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/del.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -397,6 +397,8 @@ return 0; } + nErrorLevel = 0; + arg = split (param, &args, FALSE); if (args == 0) _____ Modified: trunk/reactos/subsys/system/cmd/delay.c --- trunk/reactos/subsys/system/cmd/delay.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/delay.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -26,6 +26,8 @@ return 0; } + nErrorLevel = 0; + if (*param==0) { error_req_param_missing (); _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -1823,7 +1823,7 @@ free(ptrStartNode); ptrStartNode = ptrNextNode; dwCount --; - } + } return 1; } @@ -1951,14 +1951,22 @@ stFlags.stOrderBy.sCriteriaCount = 0; stFlags.stOrderBy.bUnSet = FALSE; + nErrorLevel = 0; + /* read the parameters from the DIRCMD environment variable */ if (GetEnvironmentVariable (_T("DIRCMD"), dircmd, 256)) if (!DirReadParam(dircmd, &param, &stFlags)) + { + nErrorLevel = 1; return 1; + } /* read the parameters */ if (!DirReadParam(rest, &param, &stFlags)) + { + nErrorLevel = 1; return 1; + } /* default to current directory */ if (!param) @@ -1966,7 +1974,10 @@ /* parse the directory info */ if (DirParsePathspec (param, szPath, szFilespec)) + { + nErrorLevel = 1; return 1; + } /* <Debug :> Uncomment this to show the final state of switch flags*/ @@ -1993,11 +2004,17 @@ /* print the header */ if (!stFlags.bBareFormat) if (!PrintDirectoryHeader (szPath, &nLine, &stFlags)) + { + nErrorLevel = 1; return 1; + } /* do the actual dir */ if (DirList (szPath, szFilespec, &nLine, &stFlags)) + { + nErrorLevel = 1; return 1; + } /* print the footer */ PrintSummary(szPath, @@ -2006,8 +2023,7 @@ recurse_bytes, &nLine, &stFlags); - - nErrorLevel = 0; + return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/dirstack.c --- trunk/reactos/subsys/system/cmd/dirstack.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/dirstack.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -37,6 +37,8 @@ { LPDIRENTRY lpDir; + nErrorLevel = 0; + lpDir = (LPDIRENTRY)malloc (sizeof (DIRENTRY)); if (!lpDir) { @@ -78,6 +80,8 @@ { LPDIRENTRY lpDir; + nErrorLevel = 0; + if (nStackDepth == 0) return; @@ -98,6 +102,8 @@ static VOID GetDirectoryStackTop (LPTSTR pszPath) { + nErrorLevel = 0; + if (lpStackTop) _tcsncpy (pszPath, lpStackTop->pszPath, MAX_PATH); else @@ -147,6 +153,8 @@ return 0; } + nErrorLevel = 0; + if (rest[0] != _T('\0')) { GetFullPathName (rest, MAX_PATH, newPath, NULL); @@ -177,6 +185,8 @@ return 0; } + nErrorLevel = 0; + if (GetDirectoryStackDepth () == 0) return 0; @@ -202,6 +212,7 @@ return 0; } + nErrorLevel = 0; lpDir = lpStackBottom; _____ Modified: trunk/reactos/subsys/system/cmd/move.c --- trunk/reactos/subsys/system/cmd/move.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/move.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -140,6 +140,7 @@ return 0; } + nErrorLevel = 0; arg = split (param, &argc, FALSE); nFiles = argc; _____ Modified: trunk/reactos/subsys/system/cmd/path.c --- trunk/reactos/subsys/system/cmd/path.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/path.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -43,6 +43,8 @@ return 0; } + nErrorLevel = 0; + /* if param is empty, display the PATH environment variable */ if (!param || !*param) { @@ -76,7 +78,10 @@ /* set PATH environment variable */ if (!SetEnvironmentVariable (_T("PATH"), param)) + { + nErrorLevel = 1; return 1; + } return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/ren.c --- trunk/reactos/subsys/system/cmd/ren.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/ren.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -66,6 +66,8 @@ return 0; } + nErrorLevel = 0; + /* split the argument list */ arg = split(param, &args, FALSE); _____ Modified: trunk/reactos/subsys/system/cmd/screen.c --- trunk/reactos/subsys/system/cmd/screen.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/screen.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -28,6 +28,8 @@ return 0; } + nErrorLevel = 0; + //get row while(_istspace(*param)) param++; @@ -42,6 +44,7 @@ if (y<0 || y>(maxy-1)) { ConOutResPuts(STRING_SCREEN_ROW); + return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/set.c --- trunk/reactos/subsys/system/cmd/set.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/set.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -55,6 +55,7 @@ return 0; } + /* if no parameters, show the environment */ if (param[0] == _T('\0')) { _____ Modified: trunk/reactos/subsys/system/cmd/shift.c --- trunk/reactos/subsys/system/cmd/shift.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/shift.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -50,9 +50,12 @@ return 0; } + nErrorLevel = 0; + if (bc == NULL) { /* not in batch - error!! */ + nErrorLevel = 1; return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/start.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -29,6 +29,8 @@ return 0; } + nErrorLevel = 0; + /* check for a drive change */ if (!_tcscmp (first + 1, _T(":")) && _istalpha (*first)) { _____ Modified: trunk/reactos/subsys/system/cmd/timer.c --- trunk/reactos/subsys/system/cmd/timer.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/timer.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -107,6 +107,8 @@ return 0; } + nErrorLevel = 0; + LoadString( CMD_ModuleHandle, STRING_TIMER_TIME, szMsg, RC_STRING_MAX_SIZE); p = split (param, &argc, FALSE); _____ Modified: trunk/reactos/subsys/system/cmd/type.c --- trunk/reactos/subsys/system/cmd/type.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/type.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -50,7 +50,7 @@ { ConOutResPaging(TRUE,STRING_TYPE_HELP1); return 0; - } + } if (!*param) { _____ Modified: trunk/reactos/subsys/system/cmd/vol.c --- trunk/reactos/subsys/system/cmd/vol.c 2005-08-18 19:26:37 UTC (rev 17429) +++ trunk/reactos/subsys/system/cmd/vol.c 2005-08-18 20:52:52 UTC (rev 17430) @@ -107,6 +107,7 @@ /* print the header */ if (!PrintVolumeHeader (szRootPath)) { + nErrorLevel = 1; return 1; }

19 years, 1 month

← Newer
1
...
14
15
16
17
18
19
20
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005