diff options
| author | qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-04-16 05:20:06 +0000 |
|---|---|---|
| committer | qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-04-16 05:20:06 +0000 |
| commit | 56056c7cd8c829baa5941f5650b3739e074c7f71 (patch) | |
| tree | d53ecd1e65d31d6b7feedcd7fc871a2d5f69be4f /EdkModulePkg/Bus | |
| parent | df13cebafa37f6b1e78157ad1b93de69fb0f34dd (diff) | |
| download | edk2-platforms-56056c7cd8c829baa5941f5650b3739e074c7f71.tar.xz | |
1. UsbMassStorage: Increase the timeout of USBFloppyRead10 and USBFloppyWrite10 for data transfer.
2. PxeBc: Fix array out bound error and add code to check the validation of the IP and subnet mask addresses.
3. DxeIpl: Make sure FV HOB is not corrupted by checking FV signature.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2570 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EdkModulePkg/Bus')
| -rw-r--r-- | EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorageData.h | 7 | ||||
| -rw-r--r-- | EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorageHelper.c | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorageData.h b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorageData.h index cef33bd4f5..56dbcd8e40 100644 --- a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorageData.h +++ b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorageData.h @@ -1,5 +1,5 @@ /*++
-Copyright (c) 2006, Intel Corporation
+Copyright (c) 2006 - 2007, Intel Corporation
All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -30,9 +30,10 @@ Revision History //
// timeout unit is in millisecond.
//
-#define USBFLPTIMEOUT 1000
-#define STALL_1_MILLI_SECOND 1000
+#define STALL_1_MILLI_SECOND 1000
+#define USBFLPTIMEOUT STALL_1_MILLI_SECOND
+#define USBDATATIMEOUT 2 * STALL_1_MILLI_SECOND
//
// ATAPI Packet Command
//
diff --git a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorageHelper.c b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorageHelper.c index eb7a8bb63a..6483601b2b 100644 --- a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorageHelper.c +++ b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorageHelper.c @@ -1,6 +1,6 @@ /*++
-Copyright (c) 2006, Intel Corporation
+Copyright (c) 2006 - 2007, Intel Corporation
All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -348,7 +348,7 @@ USBFloppyRead10 ( ByteCount = SectorCount * BlockSize;
- TimeOut = (UINT16) (SectorCount * USBFLPTIMEOUT);
+ TimeOut = (UINT16) (SectorCount * USBDATATIMEOUT);
Status = USBFloppyPacketCommand (
@@ -780,7 +780,7 @@ USBFloppyWrite10 ( ByteCount = SectorCount * BlockSize;
- TimeOut = (UINT16) (SectorCount * USBFLPTIMEOUT);
+ TimeOut = (UINT16) (SectorCount * USBDATATIMEOUT);
Status = USBFloppyPacketCommand (
UsbFloppyDevice,
|