diff options
| author | rsun3 <rsun3@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-06-10 06:35:16 +0000 |
|---|---|---|
| committer | rsun3 <rsun3@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-06-10 06:35:16 +0000 |
| commit | 6fcb2d910a60879e4fe8e50ec59eab160ad864e3 (patch) | |
| tree | f06db5f04e0b7943c2d27ed37be3920e40c14466 | |
| parent | 966877cbd3314a5ef70a1f904de95be510dfa14f (diff) | |
| download | edk2-6fcb2d910a60879e4fe8e50ec59eab160ad864e3.zip edk2-6fcb2d910a60879e4fe8e50ec59eab160ad864e3.tar.gz edk2-6fcb2d910a60879e4fe8e50ec59eab160ad864e3.tar.bz2 | |
ISA Bus driver code scrub.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8505 6f19259b-4bc3-4df7-8a09-765794883524
7 files changed, 624 insertions, 738 deletions
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c index 5f37112..7c614b5 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c @@ -1,6 +1,7 @@ /**@file
+ UEFI Component Name(2) protocol implementation for IsaBus driver.
-Copyright (c) 2006 - 2007, Intel Corporation. <BR>
+Copyright (c) 2006 - 2009, Intel Corporation. <BR>
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
@@ -170,11 +171,11 @@ IsaBusComponentNameGetDriverName ( EFI_STATUS
EFIAPI
IsaBusComponentNameGetControllerName (
- IN EFI_COMPONENT_NAME_PROTOCOL *This,
- IN EFI_HANDLE ControllerHandle,
- IN EFI_HANDLE ChildHandle OPTIONAL,
- IN CHAR8 *Language,
- OUT CHAR16 **ControllerName
+ IN EFI_COMPONENT_NAME_PROTOCOL *This,
+ IN EFI_HANDLE ControllerHandle,
+ IN EFI_HANDLE ChildHandle OPTIONAL,
+ IN CHAR8 *Language,
+ OUT CHAR16 **ControllerName
)
{
return EFI_UNSUPPORTED;
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h index d4395f5..c198d87 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h @@ -1,6 +1,7 @@ /**@file
+ Header file for implementation of UEFI Component Name(2) protocol.
-Copyright (c) 2006 - 2007, Intel Corporation<BR>
+Copyright (c) 2006 - 2009, Intel Corporation<BR>
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
@@ -11,17 +12,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/
-#ifndef _EFI_ISA_BUS_COMPONENT_NAME_H
-#define _EFI_ISA_BUS_COMPONENT_NAME_H
+#ifndef _COMPONENT_NAME_H_
+#define _COMPONENT_NAME_H_
#include "InternalIsaBus.h"
extern EFI_COMPONENT_NAME_PROTOCOL gIsaBusComponentName;
extern EFI_COMPONENT_NAME2_PROTOCOL gIsaBusComponentName2;
-//
-// EFI Component Name Functions
-//
/**
Retrieves a Unicode string that is the user readable name of the driver.
@@ -141,12 +139,12 @@ IsaBusComponentNameGetDriverName ( EFI_STATUS
EFIAPI
IsaBusComponentNameGetControllerName (
- IN EFI_COMPONENT_NAME_PROTOCOL *This,
- IN EFI_HANDLE ControllerHandle,
- IN EFI_HANDLE ChildHandle OPTIONAL,
- IN CHAR8 *Language,
- OUT CHAR16 **ControllerName
+ IN EFI_COMPONENT_NAME_PROTOCOL *This,
+ IN EFI_HANDLE ControllerHandle,
+ IN EFI_HANDLE ChildHandle OPTIONAL,
+ IN CHAR8 *Language,
+ OUT CHAR16 **ControllerName
);
-
#endif
+
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h index 9bfd065..ad2f945 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h @@ -1,7 +1,7 @@ /**@file
The header file for ISA bus driver
-Copyright (c) 2006 - 2007, Intel Corporation. <BR>
+Copyright (c) 2006 - 2009, Intel Corporation. <BR>
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
@@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/
-#ifndef _EFI_ISA_BUS_H
-#define _EFI_ISA_BUS_H
+#ifndef _INTERNAL_ISA_BUS_H_
+#define _INTERNAL_ISA_BUS_H_
#include <PiDxe.h>
@@ -41,13 +41,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "ComponentName.h"
//
-// Global Variables
-//
-extern EFI_DRIVER_BINDING_PROTOCOL gIsaBusControllerDriver;
-
-extern EFI_ISA_IO_PROTOCOL IsaIoInterface;
-
-//
// 8237 DMA registers
//
#define R_8237_DMA_BASE_CA_CH0 0x00
@@ -165,70 +158,92 @@ typedef struct { // EFI Driver Binding Protocol Interface Functions
//
+/**
+ Tests to see if a controller can be managed by the ISA Bus Driver. If a child device is provided,
+ it further tests to see if this driver supports creating a handle for the specified child device.
+
+ Note that the ISA Bus driver always creates all of its child handles on the first call to Start().
+ How the Start() function of a driver is implemented can affect how the Supported() function is implemented.
+
+ @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
+ @param[in] Controller The handle of the controller to test.
+ @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
+
+ @retval EFI_SUCCESS The device is supported by this driver.
+ @retval EFI_ALREADY_STARTED The device is already being managed by this driver.
+ @retval EFI_ACCESS_DENIED The device is already being managed by a different driver
+ or an application that requires exclusive access.
+ @retval EFI_UNSUPPORTED The device is is not supported by this driver.
+
+**/
EFI_STATUS
EFIAPI
IsaBusControllerDriverSupported (
IN EFI_DRIVER_BINDING_PROTOCOL * This,
IN EFI_HANDLE Controller,
IN EFI_DEVICE_PATH_PROTOCOL * RemainingDevicePath OPTIONAL
- )
-/**
-
- Routine Description:
-
- This function checks to see if a controller can be managed by the ISA Bus
- Driver. This is done by checking to see if the controller supports the
- EFI_PCI_IO_PROTOCOL protocol, and then looking at the PCI Configuration
- Header to see if the device is a PCI to ISA bridge. The class code of
- PCI to ISA bridge: Base class 06h, Sub class 01h Interface 00h
-
- Arguments:
-
- This - The EFI_DRIVER_BINDING_PROTOCOL instance.
- Controller - The handle of the device to check.
- RemainingDevicePath - A pointer to the remaining portion of a device path.
+ );
- Returns:
+/**
+ Start this driver on ControllerHandle.
- EFI_SUCCESS - The device is supported by this driver.
- EFI_UNSUPPORTED - The device is not supported by this driver.
-
+ Note that the ISA Bus driver always creates all of its child handles on the first call to Start().
+ The Start() function is designed to be invoked from the EFI boot service ConnectController().
+ As a result, much of the error checking on the parameters to Start() has been moved into this
+ common boot service. It is legal to call Start() from other locations, but the following calling
+ restrictions must be followed or the system behavior will not be deterministic.
+ 1. ControllerHandle must be a valid EFI_HANDLE.
+ 2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally aligned
+ EFI_DEVICE_PATH_PROTOCOL.
+ 3. Prior to calling Start(), the Supported() function for the driver specified by This must
+ have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.
+
+ @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
+ @param[in] ControllerHandle The handle of the controller to start. This handle
+ must support a protocol interface that supplies
+ an I/O abstraction to the driver.
+ @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
+ This parameter is ignored by device drivers, and is optional for bus drivers.
+
+ @retval EFI_SUCCESS The device was started.
+ @retval EFI_DEVICE_ERROR The device could not be started due to a device error.
+ Currently not implemented.
+ @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of resources.
+ @retval Others The driver failded to start the device.
**/
-;
-
EFI_STATUS
EFIAPI
IsaBusControllerDriverStart (
IN EFI_DRIVER_BINDING_PROTOCOL * This,
IN EFI_HANDLE Controller,
IN EFI_DEVICE_PATH_PROTOCOL * RemainingDevicePath OPTIONAL
- )
-/**
+ );
- Routine Description:
-
- This function tells the ISA Bus Driver to start managing a PCI to ISA
- Bridge controller.
-
- Arguments:
-
- This - The EFI_DRIVER_BINDING_PROTOCOL instance.
- Controller - A handle to the device being started.
- RemainingDevicePath - A pointer to the remaining portion of a device path.
-
- Returns:
+/**
+ Stop this driver on ControllerHandle.
- EFI_SUCCESS - The device was started.
- EFI_UNSUPPORTED - The device is not supported.
- EFI_DEVICE_ERROR - The device could not be started due to a device error.
- EFI_ALREADY_STARTED - The device has already been started.
- EFI_INVALID_PARAMETER - One of the parameters has an invalid value.
- EFI_OUT_OF_RESOURCES - The request could not be completed due to a lack of
- resources.
+ The Stop() function is designed to be invoked from the EFI boot service DisconnectController().
+ As a result, much of the error checking on the parameters to Stop() has been moved
+ into this common boot service. It is legal to call Stop() from other locations,
+ but the following calling restrictions must be followed or the system behavior will not be deterministic.
+ 1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this
+ same driver's Start() function.
+ 2. The first NumberOfChildren handles of ChildHandleBuffer must all be a valid
+ EFI_HANDLE. In addition, all of these handles must have been created in this driver's
+ Start() function, and the Start() function must have called OpenProtocol() on
+ ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
+ @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
+ @param[in] ControllerHandle A handle to the device being stopped. The handle must
+ support a bus specific I/O protocol for the driver
+ to use to stop the device.
+ @param[in] NumberOfChildren The number of child device handles in ChildHandleBuffer.
+ @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL
+ if NumberOfChildren is 0.
+
+ @retval EFI_SUCCESS The device was stopped.
+ @retval EFI_DEVICE_ERROR The device could not be stopped due to a device error.
**/
-;
-
EFI_STATUS
EFIAPI
IsaBusControllerDriverStop (
@@ -236,38 +251,26 @@ IsaBusControllerDriverStop ( IN EFI_HANDLE Controller,
IN UINTN NumberOfChildren,
IN EFI_HANDLE * ChildHandleBuffer OPTIONAL
- )
-/**
-
- Routine Description:
-
- This function tells the ISA Bus Driver to stop managing a PCI to ISA
- Bridge controller.
-
- Arguments:
-
- This - The EFI_DRIVER_BINDING_PROTOCOL instance.
- Controller - A handle to the device being stopped.
- NumberOfChindren - The number of child device handles in ChildHandleBuffer.
- ChildHandleBuffer - An array of child handles to be freed.
-
-
- Returns:
-
- EFI_SUCCESS - The device was stopped.
- EFI_DEVICE_ERROR - The device could not be stopped due to a device error.
- EFI_NOT_STARTED - The device has not been started.
- EFI_INVALID_PARAMETER - One of the parameters has an invalid value.
- EFI_OUT_OF_RESOURCES - The request could not be completed due to a lack of
- resources.
-
-**/
-;
+ );
//
// Function Prototypes
//
+/**
+ Create EFI Handle for a ISA device found via ISA ACPI Protocol
+
+ @param[in] This The EFI_DRIVER_BINDING_PROTOCOL instance.
+ @param[in] Controller The handle of ISA bus controller(PCI to ISA bridge)
+ @param[in] PciIo The Pointer to the PCI protocol
+ @param[in] ParentDevicePath Device path of the ISA bus controller
+ @param[in] IsaDeviceResourceList The resource list of the ISA device
+ @param[in] ChildDevicePath The pointer to the child device.
+
+ @retval EFI_SUCCESS The handle for the child device was created.
+ @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of resources.
+ @retval EFI_DEVICE_ERROR The handle for the child device can not be created.
+**/
EFI_STATUS
IsaCreateDevice (
IN EFI_DRIVER_BINDING_PROTOCOL *This,
@@ -276,53 +279,21 @@ IsaCreateDevice ( IN EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath,
IN EFI_ISA_ACPI_RESOURCE_LIST *IsaDeviceResourceList,
OUT EFI_DEVICE_PATH_PROTOCOL **ChildDevicePath
- )
-/**
+ );
- Routine Description:
-
- Create ISA device found by IsaPnpProtocol
+/**
+ Initializes an ISA I/O Instance
- Arguments:
-
- This - The EFI_DRIVER_BINDING_PROTOCOL instance.
- Controller - The handle of ISA bus controller(PCI to ISA bridge)
- PciIo - The Pointer to the PCI protocol
- ParentDevicePath - Device path of the ISA bus controller
- IsaDeviceResourceList - The resource list of the ISA device
- ChildDevicePath - The pointer to the child device.
-
- Returns:
+ @param[in] IsaIoDevice The iso device to be initialized.
+ @param[in] IsaDeviceResourceList The resource list.
- EFI_SUCCESS - Create the child device.
- EFI_OUT_OF_RESOURCES - The request could not be completed due to a lack of
- resources.
- EFI_DEVICE_ERROR - Can not create child device.
-
+ @retval None
**/
-;
-
-EFI_STATUS
+VOID
InitializeIsaIoInstance (
IN ISA_IO_DEVICE *IsaIoDevice,
IN EFI_ISA_ACPI_RESOURCE_LIST *IsaDevice
- )
-/**
-
-Routine Description:
-
- Initializes an ISA I/O Instance
-
-Arguments:
-
- IsaIoDevice - The iso device to be initialized.
- IsaDevice - The resource list.
-
-Returns:
-
- EFI_SUCCESS - Initial success.
-
-**/
-;
+ );
#endif
+
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaIo.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaIo.h index d02c927..b5e6694 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaIo.h +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaIo.h @@ -1,7 +1,7 @@ /**@file
The header file for EFI_ISA_IO protocol implementation.
-Copyright (c) 2006 - 2007, Intel Corporation.<BR>
+Copyright (c) 2006 - 2009, Intel Corporation.<BR>
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
@@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/
-#ifndef _EFI_ISA_IO_LOCAL_H
-#define _EFI_ISA_IO_LOCAL_H
+#ifndef _INTERNAL_ISA_IO_H_
+#define _INTERNAL_ISA_IO_H_
#include "InternalIsaBus.h"
@@ -23,57 +23,57 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. EFI_STATUS
IsaIoVerifyAccess (
- IN ISA_IO_DEVICE *IsaIoDevice,
- IN ISA_ACCESS_TYPE Type,
- IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
- IN UINTN Count,
- IN OUT UINT32 *Offset
+ IN ISA_IO_DEVICE *IsaIoDevice,
+ IN ISA_ACCESS_TYPE Type,
+ IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
+ IN UINTN Count,
+ IN UINT32 Offset
);
EFI_STATUS
EFIAPI
IsaIoIoRead (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
- IN UINT32 Offset,
- IN UINTN Count,
- IN OUT VOID *Buffer
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
+ IN UINT32 Offset,
+ IN UINTN Count,
+ OUT VOID *Buffer
);
EFI_STATUS
EFIAPI
IsaIoIoWrite (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
- IN UINT32 Offset,
- IN UINTN Count,
- IN OUT VOID *Buffer
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
+ IN UINT32 Offset,
+ IN UINTN Count,
+ IN VOID *Buffer
);
EFI_STATUS
EFIAPI
IsaIoMap (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN EFI_ISA_IO_PROTOCOL_OPERATION Operation,
- IN UINT8 ChannelNumber OPTIONAL,
- IN UINT32 ChannelAttributes,
- IN VOID *HostAddress,
- IN OUT UINTN *NumberOfBytes,
- OUT EFI_PHYSICAL_ADDRESS *DeviceAddress,
- OUT VOID **Mapping
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN EFI_ISA_IO_PROTOCOL_OPERATION Operation,
+ IN UINT8 ChannelNumber OPTIONAL,
+ IN UINT32 ChannelAttributes,
+ IN VOID *HostAddress,
+ IN OUT UINTN *NumberOfBytes,
+ OUT EFI_PHYSICAL_ADDRESS *DeviceAddress,
+ OUT VOID **Mapping
);
EFI_STATUS
EFIAPI
IsaIoUnmap (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN VOID *Mapping
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN VOID *Mapping
);
EFI_STATUS
EFIAPI
IsaIoFlush (
- IN EFI_ISA_IO_PROTOCOL *This
+ IN EFI_ISA_IO_PROTOCOL *This
);
EFI_STATUS
@@ -83,69 +83,70 @@ ReportErrorStatusCode ( EFI_STATUS
WriteDmaPort (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN UINT32 AddrOffset,
- IN UINT32 PageOffset,
- IN UINT32 CountOffset,
- IN UINT32 BaseAddress,
- IN UINT16 Count
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN UINT32 AddrOffset,
+ IN UINT32 PageOffset,
+ IN UINT32 CountOffset,
+ IN UINT32 BaseAddress,
+ IN UINT16 Count
);
EFI_STATUS
WritePort (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN UINT32 Offset,
- IN UINT8 Value
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN UINT32 Offset,
+ IN UINT8 Value
);
EFI_STATUS
EFIAPI
IsaIoMemRead (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
- IN UINT32 Offset,
- IN UINTN Count,
- IN OUT VOID *Buffer
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
+ IN UINT32 Offset,
+ IN UINTN Count,
+ OUT VOID *Buffer
);
EFI_STATUS
EFIAPI
IsaIoMemWrite (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
- IN UINT32 Offset,
- IN UINTN Count,
- IN OUT VOID *Buffer
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
+ IN UINT32 Offset,
+ IN UINTN Count,
+ IN VOID *Buffer
);
EFI_STATUS
EFIAPI
IsaIoCopyMem (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
- IN UINT32 DestOffset,
- IN UINT32 SrcOffset,
- IN UINTN Count
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
+ IN UINT32 DestOffset,
+ IN UINT32 SrcOffset,
+ IN UINTN Count
);
EFI_STATUS
EFIAPI
IsaIoAllocateBuffer (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN EFI_ALLOCATE_TYPE Type,
- IN EFI_MEMORY_TYPE MemoryType,
- IN UINTN Pages,
- OUT VOID **HostAddress,
- IN UINT64 Attributes
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN EFI_ALLOCATE_TYPE Type,
+ IN EFI_MEMORY_TYPE MemoryType,
+ IN UINTN Pages,
+ OUT VOID **HostAddress,
+ IN UINT64 Attributes
);
EFI_STATUS
EFIAPI
IsaIoFreeBuffer (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN UINTN Pages,
- IN VOID *HostAddress
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN UINTN Pages,
+ IN VOID *HostAddress
);
#endif
+
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c index c1d0915..6af43dc 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c @@ -1,13 +1,12 @@ /**@file
+ ISA Bus UEFI driver.
- Discovers all the ISA Controllers and their resources by using the ISA PnP
+ Discovers all the ISA Controllers and their resources by using the ISA ACPI
Protocol, produces an instance of the ISA I/O Protocol for every ISA
- Controller found, loads and initializes all ISA Device Drivers, matches ISA
- Device Drivers with their respective ISA Controllers in a deterministic
- manner, and informs a ISA Device Driver when it is to start managing an ISA
- Controller.
+ Controller found. This driver is designed to manage a PCI-to-ISA bridge Device
+ such as LPC bridge.
-Copyright (c) 2006 - 2007, Intel Corporation.<BR>
+Copyright (c) 2006 - 2009, Intel Corporation.<BR>
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
@@ -18,7 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/
-
#include "InternalIsaBus.h"
//
@@ -34,14 +32,13 @@ EFI_DRIVER_BINDING_PROTOCOL gIsaBusControllerDriver = { };
/**
- The user Entry Point for module IsaBus. The user code starts with this function.
+ The main entry point for the ISA Bus driver.
- @param[in] ImageHandle The firmware allocated handle for the EFI image.
- @param[in] SystemTable A pointer to the EFI System Table.
+ @param[in] ImageHandle The firmware allocated handle for the EFI image.
+ @param[in] SystemTable A pointer to the EFI System Table.
- @retval EFI_SUCCESS The entry point is executed successfully.
- @retval other Some error occurs when executing this entry point.
-
+ @retval EFI_SUCCESS The entry point is executed successfully.
+ @retval EFI_OUT_OF_RESOURCES There was not enough memory in pool to install all the protocols.
**/
EFI_STATUS
EFIAPI
@@ -65,47 +62,44 @@ InitializeIsaBus( );
ASSERT_EFI_ERROR (Status);
-
return Status;
}
+/**
+ Tests to see if a controller can be managed by the ISA Bus Driver. If a child device is provided,
+ it further tests to see if this driver supports creating a handle for the specified child device.
+ Note that the ISA Bus driver always creates all of its child handles on the first call to Start().
+ How the Start() function of a driver is implemented can affect how the Supported() function is implemented.
+
+ @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
+ @param[in] Controller The handle of the controller to test.
+ @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
+
+ @retval EFI_SUCCESS The device is supported by this driver.
+ @retval EFI_ALREADY_STARTED The device is already being managed by this driver.
+ @retval EFI_ACCESS_DENIED The device is already being managed by a different driver
+ or an application that requires exclusive access.
+ @retval EFI_UNSUPPORTED The device is is not supported by this driver.
+
+**/
EFI_STATUS
EFIAPI
IsaBusControllerDriverSupported (
- IN EFI_DRIVER_BINDING_PROTOCOL * This,
+ IN EFI_DRIVER_BINDING_PROTOCOL *This,
IN EFI_HANDLE Controller,
- IN EFI_DEVICE_PATH_PROTOCOL * RemainingDevicePath OPTIONAL
+ IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL
)
-/**
-
- Routine Description:
-
- This function checks to see if a controller can be managed by the ISA Bus
- Driver. This is done by checking to see if the controller supports the
- EFI_PCI_IO_PROTOCOL protocol, and then looking at the PCI Configuration
- Header to see if the device is a PCI to ISA bridge. The class code of
- PCI to ISA bridge: Base class 06h, Sub class 01h Interface 00h
-
- Arguments:
-
- This - The EFI_DRIVER_BINDING_PROTOCOL instance.
- Controller - The handle of the device to check.
- RemainingDevicePath - A pointer to the remaining portion of a device path.
-
- Returns:
-
- EFI_SUCCESS - The device is supported by this driver.
- EFI_UNSUPPORTED - The device is not supported by this driver.
-
-**/
{
- EFI_STATUS Status;
- EFI_ISA_ACPI_PROTOCOL *IsaAcpi;
+ EFI_STATUS Status;
+ EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath;
+ EFI_PCI_IO_PROTOCOL *PciIo;
+ EFI_ISA_ACPI_PROTOCOL *IsaAcpi;
//
// If RemainingDevicePath is not NULL, it should verify that the first device
- // path node in RemainingDevicePath is an ACPI Device path node
+ // path node in RemainingDevicePath is an ACPI Device path node which is a
+ // legal Device Path Node for this bus driver's children.
//
if (RemainingDevicePath != NULL) {
if (RemainingDevicePath->Type != ACPI_DEVICE_PATH) {
@@ -123,21 +117,45 @@ IsaBusControllerDriverSupported ( }
}
//
- // Test the existence of DEVICE_PATH protocol
+ // Try to open EFI DEVICE PATH protocol on the controller
//
Status = gBS->OpenProtocol (
Controller,
&gEfiDevicePathProtocolGuid,
- NULL,
+ (VOID **) &ParentDevicePath,
+ This->DriverBindingHandle,
+ Controller,
+ EFI_OPEN_PROTOCOL_BY_DRIVER
+ );
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
+
+ gBS->CloseProtocol (
+ Controller,
+ &gEfiDevicePathProtocolGuid,
+ This->DriverBindingHandle,
+ Controller
+ );
+
+ //
+ // Try to get Pci IO Protocol because it is assumed
+ // to have been opened by ISA ACPI driver
+ //
+ Status = gBS->OpenProtocol (
+ Controller,
+ &gEfiPciIoProtocolGuid,
+ (VOID **) &PciIo,
This->DriverBindingHandle,
Controller,
- EFI_OPEN_PROTOCOL_TEST_PROTOCOL
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL
);
if (EFI_ERROR (Status)) {
return Status;
}
+
//
- // Get the Isa Acpi protocol
+ // Try to open the Isa Acpi protocol on the controller
//
Status = gBS->OpenProtocol (
Controller,
@@ -147,14 +165,14 @@ IsaBusControllerDriverSupported ( Controller,
EFI_OPEN_PROTOCOL_BY_DRIVER
);
- if (Status == EFI_ALREADY_STARTED) {
- return EFI_SUCCESS;
- }
-
if (EFI_ERROR (Status)) {
return Status;
}
+ //
+ // Add more check to see if the child device is valid by calling IsaAcpi->DeviceEnumerate?
+ //
+
gBS->CloseProtocol (
Controller,
&gEfiIsaAcpiProtocolGuid,
@@ -165,37 +183,40 @@ IsaBusControllerDriverSupported ( return Status;
}
+/**
+ Start this driver on ControllerHandle.
+
+ Note that the ISA Bus driver always creates all of its child handles on the first call to Start().
+ The Start() function is designed to be invoked from the EFI boot service ConnectController().
+ As a result, much of the error checking on the parameters to Start() has been moved into this
+ common boot service. It is legal to call Start() from other locations, but the following calling
+ restrictions must be followed or the system behavior will not be deterministic.
+ 1. ControllerHandle must be a valid EFI_HANDLE.
+ 2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally aligned
+ EFI_DEVICE_PATH_PROTOCOL.
+ 3. Prior to calling Start(), the Supported() function for the driver specified by This must
+ have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.
+
+ @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
+ @param[in] ControllerHandle The handle of the controller to start. This handle
+ must support a protocol interface that supplies
+ an I/O abstraction to the driver.
+ @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
+ This parameter is ignored by device drivers, and is optional for bus drivers.
+
+ @retval EFI_SUCCESS The device was started.
+ @retval EFI_DEVICE_ERROR The device could not be started due to a device error.
+ Currently not implemented.
+ @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of resources.
+ @retval Others The driver failded to start the device.
+**/
EFI_STATUS
EFIAPI
IsaBusControllerDriverStart (
- IN EFI_DRIVER_BINDING_PROTOCOL * This,
+ IN EFI_DRIVER_BINDING_PROTOCOL *This,
IN EFI_HANDLE Controller,
- IN EFI_DEVICE_PATH_PROTOCOL * RemainingDevicePath OPTIONAL
+ IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL
)
-/**
-
- Routine Description:
-
- This function tells the ISA Bus Driver to start managing a PCI to ISA
- Bridge controller.
-
- Arguments:
-
- This - The EFI_DRIVER_BINDING_PROTOCOL instance.
- Controller - A handle to the device being started.
- RemainingDevicePath - A pointer to the remaining portion of a device path.
-
- Returns:
-
- EFI_SUCCESS - The device was started.
- EFI_UNSUPPORTED - The device is not supported.
- EFI_DEVICE_ERROR - The device could not be started due to a device error.
- EFI_ALREADY_STARTED - The device has already been started.
- EFI_INVALID_PARAMETER - One of the parameters has an invalid value.
- EFI_OUT_OF_RESOURCES - The request could not be completed due to a lack of
- resources.
-
-**/
{
EFI_STATUS Status;
EFI_PCI_IO_PROTOCOL *PciIo;
@@ -211,42 +232,35 @@ IsaBusControllerDriverStart ( EFI_DEVICE_PATH_PROTOCOL *DevicePathData;
//
- // Open Device Path Protocol
+ // Get Pci IO Protocol
//
Status = gBS->OpenProtocol (
Controller,
- &gEfiDevicePathProtocolGuid,
- (VOID **) &ParentDevicePath,
+ &gEfiPciIoProtocolGuid,
+ (VOID **) &PciIo,
This->DriverBindingHandle,
Controller,
- EFI_OPEN_PROTOCOL_BY_DRIVER
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL
);
- if (EFI_ERROR (Status) && Status != EFI_ALREADY_STARTED) {
+ if (EFI_ERROR (Status)) {
return Status;
}
+
//
- // Open Pci IO Protocol
+ // Open Device Path Protocol
//
Status = gBS->OpenProtocol (
Controller,
- &gEfiPciIoProtocolGuid,
- (VOID **) &PciIo,
+ &gEfiDevicePathProtocolGuid,
+ (VOID **) &ParentDevicePath,
This->DriverBindingHandle,
Controller,
- EFI_OPEN_PROTOCOL_GET_PROTOCOL
+ EFI_OPEN_PROTOCOL_BY_DRIVER
);
if (EFI_ERROR (Status)) {
- //
- // Close opened protocol
- //
- gBS->CloseProtocol (
- Controller,
- &gEfiDevicePathProtocolGuid,
- This->DriverBindingHandle,
- Controller
- );
return Status;
}
+
//
// Open ISA Acpi Protocol
//
@@ -258,7 +272,7 @@ IsaBusControllerDriverStart ( Controller,
EFI_OPEN_PROTOCOL_BY_DRIVER
);
- if (EFI_ERROR (Status) && Status != EFI_ALREADY_STARTED) {
+ if (EFI_ERROR (Status)) {
//
// Close opened protocol
//
@@ -268,12 +282,6 @@ IsaBusControllerDriverStart ( This->DriverBindingHandle,
Controller
);
- gBS->CloseProtocol (
- Controller,
- &gEfiPciIoProtocolGuid,
- This->DriverBindingHandle,
- Controller
- );
return Status;
}
//
@@ -390,6 +398,31 @@ IsaBusControllerDriverStart ( return EFI_SUCCESS;
}
+/**
+ Stop this driver on ControllerHandle.
+
+ The Stop() function is designed to be invoked from the EFI boot service DisconnectController().
+ As a result, much of the error checking on the parameters to Stop() has been moved
+ into this common boot service. It is legal to call Stop() from other locations,
+ but the following calling restrictions must be followed or the system behavior will not be deterministic.
+ 1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this
+ same driver's Start() function.
+ 2. The first NumberOfChildren handles of ChildHandleBuffer must all be a valid
+ EFI_HANDLE. In addition, all of these handles must have been created in this driver's
+ Start() function, and the Start() function must have called OpenProtocol() on
+ ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
+
+ @param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
+ @param[in] ControllerHandle A handle to the device being stopped. The handle must
+ support a bus specific I/O protocol for the driver
+ to use to stop the device.
+ @param[in] NumberOfChildren The number of child device handles in ChildHandleBuffer.
+ @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL
+ if NumberOfChildren is 0.
+
+ @retval EFI_SUCCESS The device was stopped.
+ @retval EFI_DEVICE_ERROR The device could not be stopped due to a device error.
+**/
EFI_STATUS
EFIAPI
IsaBusControllerDriverStop (
@@ -398,31 +431,6 @@ IsaBusControllerDriverStop ( IN UINTN NumberOfChildren,
IN EFI_HANDLE * ChildHandleBuffer OPTIONAL
)
-/**
-
- Routine Description:
-
- This function tells the ISA Bus Driver to stop managing a PCI to ISA
- Bridge controller.
-
- Arguments:
-
- This - The EFI_DRIVER_BINDING_PROTOCOL instance.
- Controller - A handle to the device being stopped.
- NumberOfChindren - The number of child device handles in ChildHandleBuffer.
- ChildHandleBuffer - An array of child handles to be freed.
-
-
- Returns:
-
- EFI_SUCCESS - The device was stopped.
- EFI_DEVICE_ERROR - The device could not be stopped due to a device error.
- EFI_NOT_STARTED - The device has not been started.
- EFI_INVALID_PARAMETER - One of the parameters has an invalid value.
- EFI_OUT_OF_RESOURCES - The request could not be completed due to a lack of
- resources.
-
-**/
{
EFI_STATUS Status;
UINTN Index;
@@ -436,16 +444,6 @@ IsaBusControllerDriverStop ( //
Status = gBS->CloseProtocol (
Controller,
- &gEfiPciIoProtocolGuid,
- This->DriverBindingHandle,
- Controller
- );
- if (EFI_ERROR (Status)) {
- return Status;
- }
-
- Status = gBS->CloseProtocol (
- Controller,
&gEfiDevicePathProtocolGuid,
This->DriverBindingHandle,
Controller
@@ -527,9 +525,25 @@ IsaBusControllerDriverStop ( return EFI_SUCCESS;
}
+
//
// Internal Function
//
+
+/**
+ Create EFI Handle for a ISA device found via ISA ACPI Protocol
+
+ @param[in] This The EFI_DRIVER_BINDING_PROTOCOL instance.
+ @param[in] Controller The handle of ISA bus controller(PCI to ISA bridge)
+ @param[in] PciIo The Pointer to the PCI protocol
+ @param[in] ParentDevicePath Device path of the ISA bus controller
+ @param[in] IsaDeviceResourceList The resource list of the ISA device
+ @param[in] ChildDevicePath The pointer to the child device.
+
+ @retval EFI_SUCCESS The handle for the child device was created.
+ @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of resources.
+ @retval EFI_DEVICE_ERROR The handle for the child device can not be created.
+**/
EFI_STATUS
IsaCreateDevice (
IN EFI_DRIVER_BINDING_PROTOCOL *This,
@@ -539,29 +553,6 @@ IsaCreateDevice ( IN EFI_ISA_ACPI_RESOURCE_LIST *IsaDeviceResourceList,
OUT EFI_DEVICE_PATH_PROTOCOL **ChildDevicePath
)
-/**
-
- Routine Description:
-
- Create ISA device found by IsaPnpProtocol
-
- Arguments:
-
- This - The EFI_DRIVER_BINDING_PROTOCOL instance.
- Controller - The handle of ISA bus controller(PCI to ISA bridge)
- PciIo - The Pointer to the PCI protocol
- ParentDevicePath - Device path of the ISA bus controller
- IsaDeviceResourceList - The resource list of the ISA device
- ChildDevicePath - The pointer to the child device.
-
- Returns:
-
- EFI_SUCCESS - Create the child device.
- EFI_OUT_OF_RESOURCES - The request could not be completed due to a lack of
- resources.
- EFI_DEVICE_ERROR - Can not create child device.
-
-**/
{
EFI_STATUS Status;
ISA_IO_DEVICE *IsaIoDevice;
@@ -582,11 +573,8 @@ IsaCreateDevice ( //
// Initialize the ISA I/O instance structure
//
- Status = InitializeIsaIoInstance (IsaIoDevice, IsaDeviceResourceList);
- if (EFI_ERROR (Status)) {
- gBS->FreePool (IsaIoDevice);
- return Status;
- }
+ InitializeIsaIoInstance (IsaIoDevice, IsaDeviceResourceList);
+
//
// Build the child device path
//
@@ -602,15 +590,14 @@ IsaCreateDevice ( );
if (IsaIoDevice->DevicePath == NULL) {
- Status = EFI_DEVICE_ERROR;
+ Status = EFI_OUT_OF_RESOURCES;
goto Done;
}
*ChildDevicePath = IsaIoDevice->DevicePath;
//
- // Create a child handle and attach the DevicePath,
- // PCI I/O, and Controller State
+ // Create a child handle and install Device Path and ISA I/O protocols
//
Status = gBS->InstallMultipleProtocolInterfaces (
&IsaIoDevice->Handle,
@@ -655,3 +642,4 @@ Done: return Status;
}
+
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf index 5b27881..7f06f7f 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf @@ -1,12 +1,10 @@ #/** @file
# Component description file for IsaBus module.
#
-# Discovers all the ISA Controllers and their resources by using the ISA PnP
-# Protocol, produces an instance of the ISA I/O Protocol for every ISA
-# Controller found, loads and initializes all ISA Device Drivers, matches ISA
-# Device Drivers with their respective ISA Controllers in a deterministic
-# manner, and informs a ISA Device Driver when it is to start managing an ISA
-# Controller.
+# Discovers all the ISA Controllers and their resources by using the ISA ACPI
+# Protocol, produces an instance of the ISA I/O Protocol for every ISA
+# Controller found. This driver is designed to manage a PCI-to-ISA bridge Device
+# such as LPC bridge.
#
# Copyright (c) 2007 - 2009, Intel Corporation
#
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c index 3907e0a..99295f4 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c @@ -1,7 +1,7 @@ /**@file
The implementation for EFI_ISA_IO_PROTOCOL.
-Copyright (c) 2006 - 2007, Intel Corporation.<BR>
+Copyright (c) 2006 - 2009, Intel Corporation.<BR>
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
@@ -15,9 +15,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "InternalIsaIo.h"
//
-// Driver Support Global Variables
+// Module Variables
//
-EFI_ISA_IO_PROTOCOL IsaIoInterface = {
+EFI_ISA_IO_PROTOCOL mIsaIoInterface = {
{
IsaIoMemRead,
IsaIoMemWrite
@@ -37,7 +37,7 @@ EFI_ISA_IO_PROTOCOL IsaIoInterface = { NULL
};
-EFI_ISA_DMA_REGISTERS DmaRegisters[8] = {
+EFI_ISA_DMA_REGISTERS mDmaRegisters[8] = {
{
0x00,
0x87,
@@ -81,82 +81,72 @@ EFI_ISA_DMA_REGISTERS DmaRegisters[8] = { };
/**
- report a error Status code of PCI bus driver controller
+ report a error Status code
- @param Code - The error status code.
+ @param Code The error status code.
- @return EFI_SUCCESS - Success to report status code.
+ @return EFI_SUCCESS Success to report status code.
**/
EFI_STATUS
ReportErrorStatusCode (
EFI_STATUS_CODE_VALUE Code
)
-
{
return REPORT_STATUS_CODE (
- EFI_ERROR_CODE | EFI_ERROR_MINOR,
- Code
- );
+ EFI_ERROR_CODE | EFI_ERROR_MINOR,
+ Code
+ );
}
-//
-// Driver Support Functions
-//
/**
-
Initializes an ISA I/O Instance
- @param IsaIoDevice - The iso device to be initialized.
- @param IsaDeviceResourceList - The resource list.
-
- @retval EFI_SUCCESS - Initial success.
+ @param[in] IsaIoDevice The iso device to be initialized.
+ @param[in] IsaDeviceResourceList The resource list.
+ @retval None
**/
-EFI_STATUS
+VOID
InitializeIsaIoInstance (
IN ISA_IO_DEVICE *IsaIoDevice,
IN EFI_ISA_ACPI_RESOURCE_LIST *IsaDeviceResourceList
)
{
//
- // Initializes an ISA I/O Instance
+ // Use the ISA IO Protocol structure template to initialize the ISA IO instance
//
CopyMem (
&IsaIoDevice->IsaIo,
- &IsaIoInterface,
+ &mIsaIoInterface,
sizeof (EFI_ISA_IO_PROTOCOL)
);
IsaIoDevice->IsaIo.ResourceList = IsaDeviceResourceList;
-
- return EFI_SUCCESS;
}
/**
Performs an ISA I/O Read Cycle
- @param This - A pointer to the EFI_ISA_IO_PROTOCOL instance.
- @param Width - Signifies the width of the I/O operation.
- @param Offset - The offset in ISA I/O space to start the I/O operation.
- @param Count - The number of I/O operations to perform.
- @param Buffer - The destination buffer to store the results
-
- @retval EFI_SUCCESS - The data was read from the device sucessfully.
- @retval EFI_UNSUPPORTED - The Offset is not valid for this device.
- @retval EFI_INVALID_PARAMETER - Width or Count, or both, were invalid.
- @retval EFI_OUT_OF_RESOURCES - The request could not be completed due to a lack of resources.
+ @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance.
+ @param[in] Width Specifies the width of the I/O operation.
+ @param[in] Offset The offset in ISA I/O space to start the I/O operation.
+ @param[in] Count The number of I/O operations to perform.
+ @param[out] Buffer The destination buffer to store the results
+ @retval EFI_SUCCESS The data was read from the device sucessfully.
+ @retval EFI_UNSUPPORTED The Offset is not valid for this device.
+ @retval EFI_INVALID_PARAMETER Width or Count, or both, were invalid.
+ @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of resources.
**/
EFI_STATUS
EFIAPI
IsaIoIoRead (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
- IN UINT32 Offset,
- IN UINTN Count,
- IN OUT VOID *Buffer
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
+ IN UINT32 Offset,
+ IN UINTN Count,
+ OUT VOID *Buffer
)
-
{
EFI_STATUS Status;
ISA_IO_DEVICE *IsaIoDevice;
@@ -171,14 +161,12 @@ IsaIoIoRead ( IsaAccessTypeIo,
Width,
Count,
- &Offset
+ Offset
);
if (EFI_ERROR (Status)) {
return Status;
}
- //
- // Call PciIo->Io.Read
- //
+
Status = IsaIoDevice->PciIo->Io.Read (
IsaIoDevice->PciIo,
(EFI_PCI_IO_PROTOCOL_WIDTH) Width,
@@ -198,26 +186,25 @@ IsaIoIoRead ( /**
Performs an ISA I/O Write Cycle
- @param This - A pointer to the EFI_ISA_IO_PROTOCOL instance.
- @param Width - Signifies the width of the I/O operation.
- @param Offset - The offset in ISA I/O space to start the I/O operation.
- @param Count - The number of I/O operations to perform.
- @param Buffer - The source buffer to write data from
-
- @retval EFI_SUCCESS - The data was writen to the device sucessfully.
- @retval EFI_UNSUPPORTED - The Offset is not valid for this device.
- @retval EFI_INVALID_PARAMETER - Width or Count, or both, were invalid.
- @retval EFI_OUT_OF_RESOURCES - The request could not be completed due to a lack of resources.
+ @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance.
+ @param[in] Width Specifies the width of the I/O operation.
+ @param[in] Offset The offset in ISA I/O space to start the I/O operation.
+ @param[in] Count The number of I/O operations to perform.
+ @param[in] Buffer The source buffer to write data from
+ @retval EFI_SUCCESS The data was writen to the device sucessfully.
+ @retval EFI_UNSUPPORTED The Offset is not valid for this device.
+ @retval EFI_INVALID_PARAMETER Width or Count, or both, were invalid.
+ @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of resources.
**/
EFI_STATUS
EFIAPI
IsaIoIoWrite (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
- IN UINT32 Offset,
- IN UINTN Count,
- IN OUT VOID *Buffer
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
+ IN UINT32 Offset,
+ IN UINTN Count,
+ IN VOID *Buffer
)
{
EFI_STATUS Status;
@@ -233,14 +220,12 @@ IsaIoIoWrite ( IsaAccessTypeIo,
Width,
Count,
- &Offset
+ Offset
);
if (EFI_ERROR (Status)) {
return Status;
}
- //
- // Call PciIo->Io.Write
- //
+
Status = IsaIoDevice->PciIo->Io.Write (
IsaIoDevice->PciIo,
(EFI_PCI_IO_PROTOCOL_WIDTH) Width,
@@ -258,34 +243,29 @@ IsaIoIoWrite ( }
/**
- Writes an 8 bit I/O Port
+ Writes an 8-bit I/O Port
- @param This - A pointer to the EFI_ISA_IO_PROTOCOL instance.
- @param Offset - The offset in ISA IO space to start the IO operation.
- @param Value - The data to write port.
+ @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance.
+ @param[in] Offset The offset in ISA IO space to start the IO operation.
+ @param[in] Value The data to write port.
- @retval EFI_SUCCESS - Success.
- @retval EFI_INVALID_PARAMETER - Parameter is invalid.
- @retval EFI_UNSUPPORTED - The address range specified by Offset is not valid.
- @retval EFI_OUT_OF_RESOURCES - The request could not be completed due to a lack of resources.
-
+ @retval EFI_SUCCESS Success.
+ @retval EFI_INVALID_PARAMETER Parameter is invalid.
+ @retval EFI_UNSUPPORTED The address range specified by Offset is not valid.
+ @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of resources.
**/
EFI_STATUS
WritePort (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN UINT32 Offset,
- IN UINT8 Value
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN UINT32 Offset,
+ IN UINT8 Value
)
-
{
EFI_STATUS Status;
ISA_IO_DEVICE *IsaIoDevice;
IsaIoDevice = ISA_IO_DEVICE_FROM_ISA_IO_THIS (This);
- //
- // Call PciIo->Io.Write
- //
Status = IsaIoDevice->PciIo->Io.Write (
IsaIoDevice->PciIo,
EfiPciIoWidthUint8,
@@ -307,29 +287,27 @@ WritePort ( /**
Writes I/O operation base address and count number to a 8 bit I/O Port.
- @param This - A pointer to the EFI_ISA_IO_PROTOCOL instance.
- @param AddrOffset - The address' offset.
- @param PageOffset - The page's offest.
- @param CountOffset - The count's offset.
- @param BaseAddress - The base address.
- @param Count - The number of I/O operations to perform.
+ @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance.
+ @param[in] AddrOffset The address' offset.
+ @param[in] PageOffset The page's offest.
+ @param[in] CountOffset The count's offset.
+ @param[in] BaseAddress The base address.
+ @param[in] Count The number of I/O operations to perform.
- @retval EFI_SUCCESS - Success.
- @retval EFI_INVALID_PARAMETER - Parameter is invalid.
- @retval EFI_UNSUPPORTED - The address range specified by these Offsets and Count is not valid.
- @retval EFI_OUT_OF_RESOURCES - The request could not be completed due to a lack of resources.
-
+ @retval EFI_SUCCESS Success.
+ @retval EFI_INVALID_PARAMETER Parameter is invalid.
+ @retval EFI_UNSUPPORTED The address range specified by these Offsets and Count is not valid.
+ @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of resources.
**/
EFI_STATUS
WriteDmaPort (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN UINT32 AddrOffset,
- IN UINT32 PageOffset,
- IN UINT32 CountOffset,
- IN UINT32 BaseAddress,
- IN UINT16 Count
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN UINT32 AddrOffset,
+ IN UINT32 PageOffset,
+ IN UINT32 CountOffset,
+ IN UINT32 BaseAddress,
+ IN UINT16 Count
)
-
{
EFI_STATUS Status;
@@ -354,28 +332,23 @@ WriteDmaPort ( }
Status = WritePort (This, CountOffset, (UINT8) ((Count >> 8) & 0xff));
- if (EFI_ERROR (Status)) {
- return Status;
- }
-
- return EFI_SUCCESS;
+ return Status;
}
/**
Unmaps a memory region for DMA
- @param This - A pointer to the EFI_ISA_IO_PROTOCOL instance.
- @param Mapping - The mapping value returned from EFI_ISA_IO.Map().
-
- @retval EFI_SUCCESS - The range was unmapped.
- @retval EFI_DEVICE_ERROR - The data was not committed to the target system memory.
+ @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance.
+ @param[in] Mapping The mapping value returned from EFI_ISA_IO.Map().
+ @retval EFI_SUCCESS The range was unmapped.
+ @retval EFI_DEVICE_ERROR The data was not committed to the target system memory.
**/
EFI_STATUS
EFIAPI
IsaIoUnmap (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN VOID *Mapping
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN VOID *Mapping
)
{
ISA_MAP_INFO *IsaMapInfo;
@@ -421,29 +394,24 @@ IsaIoUnmap ( }
/**
- Flushes a DMA buffer
+ Flushes any posted write data to the system memory.
- @param This - A pointer to the EFI_ISA_IO_PROTOCOL instance.
-
- @retval EFI_SUCCESS - The buffers were flushed.
- @retval EFI_DEVICE_ERROR - The buffers were not flushed due to a hardware error.
+ @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance.
+ @retval EFI_SUCCESS The buffers were flushed.
+ @retval EFI_DEVICE_ERROR The buffers were not flushed due to a hardware error.
**/
EFI_STATUS
EFIAPI
IsaIoFlush (
- IN EFI_ISA_IO_PROTOCOL *This
+ IN EFI_ISA_IO_PROTOCOL *This
)
-
{
EFI_STATUS Status;
ISA_IO_DEVICE *IsaIoDevice;
IsaIoDevice = ISA_IO_DEVICE_FROM_ISA_IO_THIS (This);
- //
- // Call PciIo->Flush
- //
Status = IsaIoDevice->PciIo->Flush (IsaIoDevice->PciIo);
if (EFI_ERROR (Status)) {
@@ -456,26 +424,24 @@ IsaIoFlush ( /**
Verifies access to an ISA device
- @param IsaIoDevice - The ISA device to be verified.
- @param Type - The Access type. The input must be either IsaAccessTypeMem or IsaAccessTypeIo.
- @param Width - Signifies the width of the memory operation.
- @param Count - The number of memory operations to perform.
- @param Offset - The offset in ISA memory space to start the memory operation.
+ @param[in] IsaIoDevice The ISA device to be verified.
+ @param[in] Type The Access type. The input must be either IsaAccessTypeMem or IsaAccessTypeIo.
+ @param[in] Width The width of the memory operation.
+ @param[in] Count The number of memory operations to perform.
+ @param[in] Offset The offset in ISA memory space to start the memory operation.
- @retval EFI_SUCCESS - Verify success.
- @retval EFI_INVALID_PARAMETER - One of the parameters has an invalid value.
- @retval EFI_UNSUPPORTED - The device ont support the access type.
-
+ @retval EFI_SUCCESS Verify success.
+ @retval EFI_INVALID_PARAMETER One of the parameters has an invalid value.
+ @retval EFI_UNSUPPORTED The device ont support the access type.
**/
EFI_STATUS
IsaIoVerifyAccess (
- IN ISA_IO_DEVICE *IsaIoDevice,
- IN ISA_ACCESS_TYPE Type,
- IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
- IN UINTN Count,
- IN OUT UINT32 *Offset
+ IN ISA_IO_DEVICE *IsaIoDevice,
+ IN ISA_ACCESS_TYPE Type,
+ IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
+ IN UINTN Count,
+ IN UINT32 Offset
)
-
{
EFI_ISA_ACPI_RESOURCE *Item;
EFI_STATUS Status;
@@ -493,7 +459,7 @@ IsaIoVerifyAccess ( // If Width is EfiIsaIoWidthFifoUintX then convert to EfiIsaIoWidthUintX
// If Width is EfiIsaIoWidthFillUintX then convert to EfiIsaIoWidthUintX
//
- if (Width >= EfiIsaIoWidthFifoUint8 && Width <= EfiIsaIoWidthFifoReserved) {
+ if (Width >= EfiIsaIoWidthFifoUint8 && Width < EfiIsaIoWidthFifoReserved) {
Count = 1;
}
@@ -503,13 +469,12 @@ IsaIoVerifyAccess ( Item = IsaIoDevice->IsaIo.ResourceList->ResourceItem;
while (Item->Type != EfiIsaAcpiResourceEndOfList) {
if ((Type == IsaAccessTypeMem && Item->Type == EfiIsaAcpiResourceMemory) ||
- (Type == IsaAccessTypeIo && Item->Type == EfiIsaAcpiResourceIo)
- ) {
- if (*Offset >= Item->StartRange && (*Offset + Count * (UINT32)(1 << Width)) - 1 <= Item->EndRange) {
+ (Type == IsaAccessTypeIo && Item->Type == EfiIsaAcpiResourceIo)) {
+ if (Offset >= Item->StartRange && (Offset + Count * (UINT32)(1 << Width)) - 1 <= Item->EndRange) {
return EFI_SUCCESS;
}
- if (*Offset >= Item->StartRange && *Offset <= Item->EndRange) {
+ if (Offset >= Item->StartRange && Offset <= Item->EndRange) {
Status = EFI_INVALID_PARAMETER;
}
}
@@ -521,40 +486,35 @@ IsaIoVerifyAccess ( }
/**
-
Performs an ISA Memory Read Cycle
- @param This - A pointer to the EFI_ISA_IO_PROTOCOL instance.
- @param Width - Signifies the width of the memory operation.
- @param Offset - The offset in ISA memory space to start the memory operation.
- @param Count - The number of memory operations to perform.
- @param Buffer - The destination buffer to store the results
+ @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance.
+ @param[in] Width Specifies the width of the memory operation.
+ @param[in] Offset The offset in ISA memory space to start the memory operation.
+ @param[in] Count The number of memory operations to perform.
+ @param[out] Buffer The destination buffer to store the results
- @retval EFI_SUCCESS - The data was read from the device successfully.
- @retval EFI_UNSUPPORTED - The Offset is not valid for this device.
- @retval EFI_INVALID_PARAMETER - Width or Count, or both, were invalid.
- @retval EFI_OUT_OF_RESOURCES - The request could not be completed due to a lack of resources.
-
+ @retval EFI_SUCCESS The data was read from the device successfully.
+ @retval EFI_UNSUPPORTED The Offset is not valid for this device.
+ @retval EFI_INVALID_PARAMETER Width or Count, or both, were invalid.
+ @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of resources.
**/
EFI_STATUS
EFIAPI
IsaIoMemRead (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
- IN UINT32 Offset,
- IN UINTN Count,
- IN OUT VOID *Buffer
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
+ IN UINT32 Offset,
+ IN UINTN Count,
+ OUT VOID *Buffer
)
-
{
EFI_STATUS Status;
ISA_IO_DEVICE *IsaIoDevice;
//
- // Set Feature Flag PcdIsaBusSupportBusMaster to FALSE to disable support for
- // ISA Bus Master.
- //
- // So we just return EFI_UNSUPPORTED for these functions.
+ // Set Feature Flag PcdIsaBusSupportIsaMemory to FALSE to disable support for
+ // ISA bus memory read/write operations.
//
if (!FeaturePcdGet (PcdIsaBusSupportIsaMemory)) {
return EFI_UNSUPPORTED;
@@ -570,14 +530,12 @@ IsaIoMemRead ( IsaAccessTypeMem,
Width,
Count,
- &Offset
+ Offset
);
if (EFI_ERROR (Status)) {
return Status;
}
- //
- // Call PciIo->Mem.Read
- //
+
Status = IsaIoDevice->PciIo->Mem.Read (
IsaIoDevice->PciIo,
(EFI_PCI_IO_PROTOCOL_WIDTH) Width,
@@ -597,36 +555,33 @@ IsaIoMemRead ( /**
Performs an ISA Memory Write Cycle
- @param This - A pointer to the EFI_ISA_IO_PROTOCOL instance.
- @param Width - Signifies the width of the memory operation.
- @param Offset - The offset in ISA memory space to start the memory operation.
- @param Count - The number of memory operations to perform.
- @param Buffer - The source buffer to write data from
-
- @retval EFI_SUCCESS - The data was written to the device sucessfully.
- @retval EFI_UNSUPPORTED - The Offset is not valid for this device.
- @retval EFI_INVALID_PARAMETER - Width or Count, or both, were invalid.
- @retval EFI_OUT_OF_RESOURCES - The request could not be completed due to a lack of resources.
+ @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance.
+ @param[in] Width Specifies the width of the memory operation.
+ @param[in] Offset The offset in ISA memory space to start the memory operation.
+ @param[in] Count The number of memory operations to perform.
+ @param[in] Buffer The source buffer to write data from
+ @retval EFI_SUCCESS The data was written to the device sucessfully.
+ @retval EFI_UNSUPPORTED The Offset is not valid for this device.
+ @retval EFI_INVALID_PARAMETER Width or Count, or both, were invalid.
+ @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of resources.
**/
EFI_STATUS
EFIAPI
IsaIoMemWrite (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
- IN UINT32 Offset,
- IN UINTN Count,
- IN OUT VOID *Buffer
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
+ IN UINT32 Offset,
+ IN UINTN Count,
+ IN VOID *Buffer
)
{
EFI_STATUS Status;
ISA_IO_DEVICE *IsaIoDevice;
//
- // Set Feature Flag PcdIsaBusSupportBusMaster to FALSE to disable support for
- // ISA Bus Master.
- //
- // So we just return EFI_UNSUPPORTED for these functions.
+ // Set Feature Flag PcdIsaBusSupportIsaMemory to FALSE to disable support for
+ // ISA bus memory read/write operations.
//
if (!FeaturePcdGet (PcdIsaBusSupportIsaMemory)) {
return EFI_UNSUPPORTED;
@@ -642,14 +597,12 @@ IsaIoMemWrite ( IsaAccessTypeMem,
Width,
Count,
- &Offset
+ Offset
);
if (EFI_ERROR (Status)) {
return Status;
}
- //
- // Call PciIo->Mem.Write
- //
+
Status = IsaIoDevice->PciIo->Mem.Write (
IsaIoDevice->PciIo,
(EFI_PCI_IO_PROTOCOL_WIDTH) Width,
@@ -667,39 +620,35 @@ IsaIoMemWrite ( }
/**
- Performs an ISA I/O Copy Memory
-
- @param This - A pointer to the EFI_ISA_IO_PROTOCOL instance.
- @param Width - Signifies the width of the memory copy operation.
- @param DestOffset - The offset of the destination
- @param SrcOffset - The offset of the source
- @param Count - The number of memory copy operations to perform
-
- @retval EFI_SUCCESS - The data was copied sucessfully.
- @retval EFI_UNSUPPORTED - The DestOffset or SrcOffset is not valid for this device.
- @retval EFI_INVALID_PARAMETER - Width or Count, or both, were invalid.
- @retval EFI_OUT_OF_RESOURCES - The request could not be completed due to a lack of resources.
-
+ Copy one region of ISA memory space to another region of ISA memory space on the ISA controller.
+
+ @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance.
+ @param[in] Width Specifies the width of the memory copy operation.
+ @param[out] DestOffset The offset of the destination
+ @param[in] SrcOffset The offset of the source
+ @param[in] Count The number of memory copy operations to perform
+
+ @retval EFI_SUCCESS The data was copied sucessfully.
+ @retval EFI_UNSUPPORTED The DestOffset or SrcOffset is not valid for this device.
+ @retval EFI_INVALID_PARAMETER Width or Count, or both, were invalid.
+ @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of resources.
**/
EFI_STATUS
EFIAPI
IsaIoCopyMem (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
- IN UINT32 DestOffset,
- IN UINT32 SrcOffset,
- IN UINTN Count
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN EFI_ISA_IO_PROTOCOL_WIDTH Width,
+ IN UINT32 DestOffset,
+ IN UINT32 SrcOffset,
+ IN UINTN Count
)
-
{
EFI_STATUS Status;
ISA_IO_DEVICE *IsaIoDevice;
//
- // Set Feature Flag PcdIsaBusSupportBusMaster to FALSE to disable support for
- // ISA Bus Master.
- //
- // So we just return EFI_UNSUPPORTED for these functions.
+ // Set Feature Flag PcdIsaBusSupportIsaMemory to FALSE to disable support for
+ // ISA bus memory read/write operations.
//
if (!FeaturePcdGet (PcdIsaBusSupportIsaMemory)) {
return EFI_UNSUPPORTED;
@@ -715,7 +664,7 @@ IsaIoCopyMem ( IsaAccessTypeMem,
Width,
Count,
- &DestOffset
+ DestOffset
);
if (EFI_ERROR (Status)) {
return Status;
@@ -726,14 +675,12 @@ IsaIoCopyMem ( IsaAccessTypeMem,
Width,
Count,
- &SrcOffset
+ SrcOffset
);
if (EFI_ERROR (Status)) {
return Status;
}
- //
- // Call PciIo->CopyMem
- //
+
Status = IsaIoDevice->PciIo->CopyMem (
IsaIoDevice->PciIo,
(EFI_PCI_IO_PROTOCOL_WIDTH) Width,
@@ -755,40 +702,38 @@ IsaIoCopyMem ( Maps a memory region for DMA, note this implementation
only supports slave read/write operation to save code size.
- @param This - A pointer to the EFI_ISA_IO_PROTOCOL instance.
- @param Operation - Indicates the type of DMA (slave or bus master), and if
- the DMA operation is going to read or write to system memory.
- @param ChannelNumber - The slave channel number to use for this DMA operation.
- If Operation and ChannelAttributes shows that this device
- performs bus mastering DMA, then this field is ignored.
- The legal range for this field is 0..7.
- @param ChannelAttributes - The attributes of the DMA channel to use for this DMA operation
- @param HostAddress - The system memory address to map to the device.
- @param NumberOfBytes - On input the number of bytes to map. On output the number
- of bytes that were mapped.
- @param DeviceAddress - The resulting map address for the bus master device to use
- to access the hosts HostAddress.
- @param Mapping - A resulting value to pass to EFI_ISA_IO.Unmap().
-
- @retval EFI_SUCCESS - The range was mapped for the returned NumberOfBytes.
- @retval EFI_INVALID_PARAMETER - The Operation or HostAddress is undefined.
- @retval EFI_UNSUPPORTED - The HostAddress can not be mapped as a common buffer.
- @retval EFI_DEVICE_ERROR - The system hardware could not map the requested address.
- @retval EFI_OUT_OF_RESOURCES - The memory pages could not be allocated.
-
+ @param This A pointer to the EFI_ISA_IO_PROTOCOL instance.
+ @param Operation Indicates the type of DMA (slave or bus master), and if
+ the DMA operation is going to read or write to system memory.
+ @param ChannelNumber The slave channel number to use for this DMA operation.
+ If Operation and ChannelAttributes shows that this device
+ performs bus mastering DMA, then this field is ignored.
+ The legal range for this field is 0..7.
+ @param ChannelAttributes The attributes of the DMA channel to use for this DMA operation
+ @param HostAddress The system memory address to map to the device.
+ @param NumberOfBytes On input the number of bytes to map. On output the number
+ of bytes that were mapped.
+ @param DeviceAddress The resulting map address for the bus master device to use
+ to access the hosts HostAddress.
+ @param Mapping A resulting value to pass to EFI_ISA_IO.Unmap().
+
+ @retval EFI_SUCCESS The range was mapped for the returned NumberOfBytes.
+ @retval EFI_INVALID_PARAMETER The Operation or HostAddress is undefined.
+ @retval EFI_UNSUPPORTED The HostAddress can not be mapped as a common buffer.
+ @retval EFI_DEVICE_ERROR The system hardware could not map the requested address.
+ @retval EFI_OUT_OF_RESOURCES The memory pages could not be allocated.
**/
EFI_STATUS
-IsaIoMap_OnlySupportSlaveReadWrite (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN EFI_ISA_IO_PROTOCOL_OPERATION Operation,
- IN UINT8 ChannelNumber OPTIONAL,
- IN UINT32 ChannelAttributes,
- IN VOID *HostAddress,
- IN OUT UINTN *NumberOfBytes,
- OUT EFI_PHYSICAL_ADDRESS *DeviceAddress,
- OUT VOID **Mapping
+IsaIoMapOnlySupportSlaveReadWrite (
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN EFI_ISA_IO_PROTOCOL_OPERATION Operation,
+ IN UINT8 ChannelNumber OPTIONAL,
+ IN UINT32 ChannelAttributes,
+ IN VOID *HostAddress,
+ IN OUT UINTN *NumberOfBytes,
+ OUT EFI_PHYSICAL_ADDRESS *DeviceAddress,
+ OUT VOID **Mapping
)
-
{
EFI_STATUS Status;
EFI_PHYSICAL_ADDRESS PhysicalAddress;
@@ -797,7 +742,6 @@ IsaIoMap_OnlySupportSlaveReadWrite ( UINTN MaxNumberOfBytes;
UINT32 BaseAddress;
UINT16 Count;
-
UINT8 DmaMask;
UINT8 DmaClear;
UINT8 DmaChannelMode;
@@ -811,7 +755,6 @@ IsaIoMap_OnlySupportSlaveReadWrite ( return EFI_INVALID_PARAMETER;
}
-
//
// Initialize the return values to their defaults
//
@@ -837,7 +780,7 @@ IsaIoMap_OnlySupportSlaveReadWrite ( // Map the HostAddress to a DeviceAddress.
//
PhysicalAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) HostAddress;
- if ((PhysicalAddress +*NumberOfBytes) > ISA_MAX_MEMORY_ADDRESS) {
+ if ((PhysicalAddress + *NumberOfBytes) > ISA_MAX_MEMORY_ADDRESS) {
//
// Common Buffer operations can not be remapped. If the common buffer
// is above 16MB, then it is not possible to generate a mapping, so return
@@ -969,9 +912,9 @@ IsaIoMap_OnlySupportSlaveReadWrite ( Status = WriteDmaPort (
This,
- DmaRegisters[ChannelNumber].Address,
- DmaRegisters[ChannelNumber].Page,
- DmaRegisters[ChannelNumber].Count,
+ mDmaRegisters[ChannelNumber].Address,
+ mDmaRegisters[ChannelNumber].Page,
+ mDmaRegisters[ChannelNumber].Count,
BaseAddress,
Count
);
@@ -995,30 +938,29 @@ IsaIoMap_OnlySupportSlaveReadWrite ( Maps a memory region for DMA. This implementation implement the
the full mapping support.
- @param This - A pointer to the EFI_ISA_IO_PROTOCOL instance.
- @param Operation - Indicates the type of DMA (slave or bus master), and if
- the DMA operation is going to read or write to system memory.
- @param ChannelNumber - The slave channel number to use for this DMA operation.
- If Operation and ChannelAttributes shows that this device
- performs bus mastering DMA, then this field is ignored.
- The legal range for this field is 0..7.
- @param ChannelAttributes - The attributes of the DMA channel to use for this DMA operation
- @param HostAddress - The system memory address to map to the device.
- @param NumberOfBytes - On input the number of bytes to map. On output the number
- of bytes that were mapped.
- @param DeviceAddress - The resulting map address for the bus master device to use
- - to access the hosts HostAddress.
- @param Mapping - A resulting value to pass to EFI_ISA_IO.Unmap().
+ @param This A pointer to the EFI_ISA_IO_PROTOCOL instance.
+ @param Operation Indicates the type of DMA (slave or bus master), and if
+ the DMA operation is going to read or write to system memory.
+ @param ChannelNumber The slave channel number to use for this DMA operation.
+ If Operation and ChannelAttributes shows that this device
+ performs bus mastering DMA, then this field is ignored.
+ The legal range for this field is 0..7.
+ @param ChannelAttributes The attributes of the DMA channel to use for this DMA operation
+ @param HostAddress The system memory address to map to the device.
+ @param NumberOfBytes On input the number of bytes to map. On output the number
+ of bytes that were mapped.
+ @param DeviceAddress The resulting map address for the bus master device to use
+ to access the hosts HostAddress.
+ @param Mapping A resulting value to pass to EFI_ISA_IO.Unmap().
@retval EFI_SUCCESS - The range was mapped for the returned NumberOfBytes.
@retval EFI_INVALID_PARAMETER - The Operation or HostAddress is undefined.
@retval EFI_UNSUPPORTED - The HostAddress can not be mapped as a common buffer.
@retval EFI_DEVICE_ERROR - The system hardware could not map the requested address.
@retval EFI_OUT_OF_RESOURCES - The memory pages could not be allocated.
-
**/
EFI_STATUS
-IsaIoMap_FullSupport (
+IsaIoMapFullSupport (
IN EFI_ISA_IO_PROTOCOL *This,
IN EFI_ISA_IO_PROTOCOL_OPERATION Operation,
IN UINT8 ChannelNumber OPTIONAL,
@@ -1028,7 +970,6 @@ IsaIoMap_FullSupport ( OUT EFI_PHYSICAL_ADDRESS *DeviceAddress,
OUT VOID **Mapping
)
-
{
EFI_STATUS Status;
BOOLEAN Master;
@@ -1039,7 +980,6 @@ IsaIoMap_FullSupport ( UINTN MaxNumberOfBytes;
UINT32 BaseAddress;
UINT16 Count;
-
UINT8 DmaMask;
UINT8 DmaClear;
UINT8 DmaChannelMode;
@@ -1053,7 +993,6 @@ IsaIoMap_FullSupport ( return EFI_INVALID_PARAMETER;
}
-
//
// Initialize the return values to their defaults
//
@@ -1303,9 +1242,9 @@ IsaIoMap_FullSupport ( Status = WriteDmaPort (
This,
- DmaRegisters[ChannelNumber].Address,
- DmaRegisters[ChannelNumber].Page,
- DmaRegisters[ChannelNumber].Count,
+ mDmaRegisters[ChannelNumber].Address,
+ mDmaRegisters[ChannelNumber].Page,
+ mDmaRegisters[ChannelNumber].Count,
BaseAddress,
Count
);
@@ -1328,45 +1267,42 @@ IsaIoMap_FullSupport ( /**
Maps a memory region for DMA
- @param This - A pointer to the EFI_ISA_IO_PROTOCOL instance.
- @param Operation - Indicates the type of DMA (slave or bus master), and if
- the DMA operation is going to read or write to system memory.
- @param ChannelNumber - The slave channel number to use for this DMA operation.
- If Operation and ChannelAttributes shows that this device
- performs bus mastering DMA, then this field is ignored.
- The legal range for this field is 0..7.
- @param ChannelAttributes - The attributes of the DMA channel to use for this DMA operation
- @param HostAddress - The system memory address to map to the device.
- @param NumberOfBytes - On input the number of bytes to map. On output the number
- of bytes that were mapped.
- @param DeviceAddress - The resulting map address for the bus master device to use
- - to access the hosts HostAddress.
- @param Mapping - A resulting value to pass to EFI_ISA_IO.Unmap().
-
-
- @retval EFI_SUCCESS - The range was mapped for the returned NumberOfBytes.
- @retval EFI_INVALID_PARAMETER - The Operation or HostAddress is undefined.
- @retval EFI_UNSUPPORTED - The HostAddress can not be mapped as a common buffer.
- @retval EFI_DEVICE_ERROR - The system hardware could not map the requested address.
- @retval EFI_OUT_OF_RESOURCES - The memory pages could not be allocated.
-
+ @param This A pointer to the EFI_ISA_IO_PROTOCOL instance.
+ @param Operation Indicates the type of DMA (slave or bus master), and if
+ the DMA operation is going to read or write to system memory.
+ @param ChannelNumber The slave channel number to use for this DMA operation.
+ If Operation and ChannelAttributes shows that this device
+ performs bus mastering DMA, then this field is ignored.
+ The legal range for this field is 0..7.
+ @param ChannelAttributes The attributes of the DMA channel to use for this DMA operation
+ @param HostAddress The system memory address to map to the device.
+ @param NumberOfBytes On input the number of bytes to map. On output the number
+ of bytes that were mapped.
+ @param DeviceAddress The resulting map address for the bus master device to use
+ to access the hosts HostAddress.
+ @param Mapping A resulting value to pass to EFI_ISA_IO.Unmap().
+
+ @retval EFI_SUCCESS The range was mapped for the returned NumberOfBytes.
+ @retval EFI_INVALID_PARAMETER The Operation or HostAddress is undefined.
+ @retval EFI_UNSUPPORTED The HostAddress can not be mapped as a common buffer.
+ @retval EFI_DEVICE_ERROR The system hardware could not map the requested address.
+ @retval EFI_OUT_OF_RESOURCES The memory pages could not be allocated.
**/
EFI_STATUS
EFIAPI
IsaIoMap (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN EFI_ISA_IO_PROTOCOL_OPERATION Operation,
- IN UINT8 ChannelNumber OPTIONAL,
- IN UINT32 ChannelAttributes,
- IN VOID *HostAddress,
- IN OUT UINTN *NumberOfBytes,
- OUT EFI_PHYSICAL_ADDRESS *DeviceAddress,
- OUT VOID **Mapping
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN EFI_ISA_IO_PROTOCOL_OPERATION Operation,
+ IN UINT8 ChannelNumber OPTIONAL,
+ IN UINT32 ChannelAttributes,
+ IN VOID *HostAddress,
+ IN OUT UINTN *NumberOfBytes,
+ OUT EFI_PHYSICAL_ADDRESS *DeviceAddress,
+ OUT VOID **Mapping
)
-
{
//
- // Or unset Feature Flag PcdIsaBusSupportDma to disable support for ISA DMA.
+ // Set Feature Flag PcdIsaBusSupportDma to FALSE to disable support for ISA DMA.
//
if (!FeaturePcdGet (PcdIsaBusSupportDma)) {
return EFI_UNSUPPORTED;
@@ -1378,57 +1314,56 @@ IsaIoMap ( // So we just return EFI_UNSUPPORTED for these functions.
//
if (FeaturePcdGet (PcdIsaBusOnlySupportSlaveDma)) {
- return IsaIoMap_OnlySupportSlaveReadWrite (
- This,
- Operation,
- ChannelNumber,
- ChannelAttributes,
- HostAddress,
- NumberOfBytes,
- DeviceAddress,
- Mapping
+ return IsaIoMapOnlySupportSlaveReadWrite (
+ This,
+ Operation,
+ ChannelNumber,
+ ChannelAttributes,
+ HostAddress,
+ NumberOfBytes,
+ DeviceAddress,
+ Mapping
);
} else {
- return IsaIoMap_FullSupport (
- This,
- Operation,
- ChannelNumber,
- ChannelAttributes,
- HostAddress,
- NumberOfBytes,
- DeviceAddress,
- Mapping
+ return IsaIoMapFullSupport (
+ This,
+ Operation,
+ ChannelNumber,
+ ChannelAttributes,
+ HostAddress,
+ NumberOfBytes,
+ DeviceAddress,
+ Mapping
);
}
}
/**
- Allocates a common buffer for DMA
-
- @param This - A pointer to the EFI_ISA_IO_PROTOCOL instance.
- @param Type - The type allocation to perform.
- @param MemoryType - The type of memory to allocate.
- @param Pages - The number of pages to allocate.
- @param HostAddress - A pointer to store the base address of the allocated range.
- @param Attributes - The requested bit mask of attributes for the allocated range.
-
- @retval EFI_SUCCESS - The requested memory pages were allocated.
- @retval EFI_INVALID_PARAMETER - Type is invalid or MemoryType is invalid or HostAddress is NULL
- @retval EFI_UNSUPPORTED - Attributes is unsupported or the memory range specified
- by HostAddress, Pages, and Type is not available for common buffer use.
- @retval EFI_OUT_OF_RESOURCES - The memory pages could not be allocated.
-
+ Allocates pages that are suitable for an EfiIsaIoOperationBusMasterCommonBuffer mapping.
+
+ @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance.
+ @param[in] Type The type allocation to perform.
+ @param[in] MemoryType The type of memory to allocate.
+ @param[in] Pages The number of pages to allocate.
+ @param[out] HostAddress A pointer to store the base address of the allocated range.
+ @param[in] Attributes The requested bit mask of attributes for the allocated range.
+
+ @retval EFI_SUCCESS The requested memory pages were allocated.
+ @retval EFI_INVALID_PARAMETER Type is invalid or MemoryType is invalid or HostAddress is NULL
+ @retval EFI_UNSUPPORTED Attributes is unsupported or the memory range specified
+ by HostAddress, Pages, and Type is not available for common buffer use.
+ @retval EFI_OUT_OF_RESOURCES The memory pages could not be allocated.
**/
EFI_STATUS
EFIAPI
IsaIoAllocateBuffer (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN EFI_ALLOCATE_TYPE Type,
- IN EFI_MEMORY_TYPE MemoryType,
- IN UINTN Pages,
- OUT VOID **HostAddress,
- IN UINT64 Attributes
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN EFI_ALLOCATE_TYPE Type,
+ IN EFI_MEMORY_TYPE MemoryType,
+ IN UINTN Pages,
+ OUT VOID **HostAddress,
+ IN UINT64 Attributes
)
{
EFI_STATUS Status;
@@ -1457,7 +1392,7 @@ IsaIoAllocateBuffer ( return EFI_INVALID_PARAMETER;
}
- if (Attributes &~(EFI_ISA_IO_ATTRIBUTE_MEMORY_WRITE_COMBINE | EFI_ISA_IO_ATTRIBUTE_MEMORY_CACHED)) {
+ if (Attributes & ~(EFI_ISA_IO_ATTRIBUTE_MEMORY_WRITE_COMBINE | EFI_ISA_IO_ATTRIBUTE_MEMORY_CACHED)) {
return EFI_UNSUPPORTED;
}
@@ -1485,29 +1420,24 @@ IsaIoAllocateBuffer ( }
/**
+ Frees memory that was allocated with EFI_ISA_IO.AllocateBuffer().
- Frees a common buffer
-
- @param This - A pointer to the EFI_ISA_IO_PROTOCOL instance.
- @param Pages - The number of pages to free.
- @param HostAddress - The base address of the allocated range.
-
-
- @retval EFI_SUCCESS - The requested memory pages were freed.
- @retval EFI_INVALID_PARAMETER - The memory was not allocated with EFI_ISA_IO.AllocateBufer().
+ @param[in] This A pointer to the EFI_ISA_IO_PROTOCOL instance.
+ @param[in] Pages The number of pages to free.
+ @param[in] HostAddress The base address of the allocated range.
+ @retval EFI_SUCCESS The requested memory pages were freed.
+ @retval EFI_INVALID_PARAMETER The memory was not allocated with EFI_ISA_IO.AllocateBufer().
**/
-
EFI_STATUS
EFIAPI
IsaIoFreeBuffer (
- IN EFI_ISA_IO_PROTOCOL *This,
- IN UINTN Pages,
- IN VOID *HostAddress
+ IN EFI_ISA_IO_PROTOCOL *This,
+ IN UINTN Pages,
+ IN VOID *HostAddress
)
{
- EFI_STATUS Status;
- EFI_PHYSICAL_ADDRESS PhysicalAddress;
+ EFI_STATUS Status;
//
// Set Feature Flag PcdIsaBusOnlySupportSlaveDma to FALSE to disable support for
@@ -1518,9 +1448,8 @@ IsaIoFreeBuffer ( return EFI_UNSUPPORTED;
}
- PhysicalAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) HostAddress;
Status = gBS->FreePages (
- PhysicalAddress,
+ (EFI_PHYSICAL_ADDRESS) (UINTN) HostAddress,
Pages
);
if (EFI_ERROR (Status)) {
|