1a2
> * Copyright (c) 2000 Mitsaru Iwasaki
27c28
< * $FreeBSD: head/sys/dev/acpica/Osd/OsdMemory.c 67760 2000-10-28 06:56:15Z msmith $
---
> * $FreeBSD: head/sys/dev/acpica/Osd/OsdMemory.c 69459 2000-12-01 10:19:28Z msmith $
67c68
< AcpiOsMapMemory (void *PhysicalAddress, UINT32 Length, void **LogicalAddress)
---
> AcpiOsMapMemory (ACPI_PHYSICAL_ADDRESS PhysicalAddress, UINT32 Length, void **LogicalAddress)
96a98,186
> static __inline
> UINT32
> AcpiOsMemInX (UINT32 Length, ACPI_PHYSICAL_ADDRESS InAddr)
> {
> UINT32 Value;
> void *LogicalAddress;
>
> if (AcpiOsMapMemory(InAddr, Length, &LogicalAddress) != AE_OK) {
> return(0);
> }
>
> switch (Length) {
> case 1:
> Value = (*(volatile u_int8_t *)LogicalAddress) & 0xff;
> break;
> case 2:
> Value = (*(volatile u_int16_t *)LogicalAddress) & 0xffff;
> break;
> case 4:
> Value = (*(volatile u_int32_t *)LogicalAddress);
> break;
> }
>
> AcpiOsUnmapMemory(LogicalAddress, Length);
>
> return(Value);
> }
>
> UINT8
> AcpiOsMemIn8 (ACPI_PHYSICAL_ADDRESS InAddr)
> {
> return((UINT8)AcpiOsMemInX(1, InAddr));
> }
>
> UINT16
> AcpiOsMemIn16 (ACPI_PHYSICAL_ADDRESS InAddr)
> {
> return((UINT16)AcpiOsMemInX(2, InAddr));
> }
>
> UINT32
> AcpiOsMemIn32 (ACPI_PHYSICAL_ADDRESS InAddr)
> {
> return((UINT32)AcpiOsMemInX(4, InAddr));
> }
>
> static __inline
> void
> AcpiOsMemOutX (UINT32 Length, ACPI_PHYSICAL_ADDRESS OutAddr, UINT32 Value)
> {
> void *LogicalAddress;
>
> if (AcpiOsMapMemory(OutAddr, Length, &LogicalAddress) != AE_OK) {
> return;
> }
>
> switch (Length) {
> case 1:
> (*(volatile u_int8_t *)LogicalAddress) = Value & 0xff;
> break;
> case 2:
> (*(volatile u_int16_t *)LogicalAddress) = Value & 0xffff;
> break;
> case 4:
> (*(volatile u_int32_t *)LogicalAddress) = Value;
> break;
> }
>
> AcpiOsUnmapMemory(LogicalAddress, Length);
> }
>
> void
> AcpiOsMemOut8 (ACPI_PHYSICAL_ADDRESS OutAddr, UINT8 Value)
> {
> AcpiOsMemOutX(1, OutAddr, (UINT32)Value);
> }
>
> void
> AcpiOsMemOut16 (ACPI_PHYSICAL_ADDRESS OutAddr, UINT16 Value)
> {
> AcpiOsMemOutX(2, OutAddr, (UINT32)Value);
> }
>
> void
> AcpiOsMemOut32 (ACPI_PHYSICAL_ADDRESS OutAddr, UINT32 Value)
> {
> AcpiOsMemOutX(4, OutAddr, (UINT32)Value);
> }
>