i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Delay creation of the DPC queue to the point when it is first used. Need this to load acpi in the early boot phase.

Browse Source 
- Automatic whitespace cleanup.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34170 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2009-11-21 10:39:49 +00:00
parent 8684e35ad7
commit 2591def6e5
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/acpi/acpi_busman.c
-7
View File
@@ -111,13 +111,6 @@ acpi_std_ops(int32 op,...)
return ENOSYS; return ENOSYS;
} }
if (gDPC->new_dpc_queue(&gDPCHandle, "acpi_task",
B_NORMAL_PRIORITY) != B_OK) {
ERROR("failed to create os execution queue\n");
return B_ERROR;
}
AcpiGbl_EnableInterpreterSlack = true; AcpiGbl_EnableInterpreterSlack = true;
// AcpiGbl_CreateOSIMethod = true; // AcpiGbl_CreateOSIMethod = true;
src/add-ons/kernel/bus_managers/acpi/oshaiku.c
+19 -13
View File
@@ -143,7 +143,7 @@ ACPI_MODULE_NAME("Haiku ACPI Module")
#define _COMPONENT ACPI_OS_SERVICES #define _COMPONENT ACPI_OS_SERVICES
// verbosity level 0 = off, 1 = normal, 2 = all // verbosity level 0 = off, 1 = normal, 2 = all
#define DEBUG_OSHAIKU 0 #define DEBUG_OSHAIKU 0
#if DEBUG_OSHAIKU <= 0 #if DEBUG_OSHAIKU <= 0
// No debugging, do nothing // No debugging, do nothing
@@ -253,7 +253,7 @@ AcpiOsGetRootPointer()
* *
*****************************************************************************/ *****************************************************************************/
ACPI_STATUS ACPI_STATUS
AcpiOsPredefinedOverride(const ACPI_PREDEFINED_NAMES *initVal, AcpiOsPredefinedOverride(const ACPI_PREDEFINED_NAMES *initVal,
ACPI_STRING *newVal) ACPI_STRING *newVal)
{ {
DEBUG_FUNCTION(); DEBUG_FUNCTION();
@@ -530,14 +530,14 @@ AcpiOsCreateSemaphore(UINT32 maxUnits, UINT32 initialUnits,
{ {
if (!outHandle) if (!outHandle)
return AE_BAD_PARAMETER; return AE_BAD_PARAMETER;
*outHandle = create_sem(initialUnits, "acpi_sem"); *outHandle = create_sem(initialUnits, "acpi_sem");
DEBUG_FUNCTION_F("max: %lu; count: %lu; result: %ld", DEBUG_FUNCTION_F("max: %lu; count: %lu; result: %ld",
maxUnits, initialUnits, *outHandle); maxUnits, initialUnits, *outHandle);
if (*outHandle >= B_OK) if (*outHandle >= B_OK)
return AE_OK; return AE_OK;
return *outHandle == B_BAD_VALUE ? AE_BAD_PARAMETER : AE_NO_MEMORY; return *outHandle == B_BAD_VALUE ? AE_BAD_PARAMETER : AE_NO_MEMORY;
} }
@@ -556,7 +556,7 @@ AcpiOsCreateSemaphore(UINT32 maxUnits, UINT32 initialUnits,
ACPI_STATUS ACPI_STATUS
AcpiOsDeleteSemaphore(ACPI_SEMAPHORE handle) AcpiOsDeleteSemaphore(ACPI_SEMAPHORE handle)
{ {
DEBUG_FUNCTION_F("sem: %ld", handle); DEBUG_FUNCTION_F("sem: %ld", handle);
return delete_sem(handle) == B_OK ? AE_OK : AE_BAD_PARAMETER; return delete_sem(handle) == B_OK ? AE_OK : AE_BAD_PARAMETER;
} }
@@ -599,7 +599,7 @@ AcpiOsWaitSemaphore(ACPI_SEMAPHORE handle, UINT32 units, UINT16 timeout)
default: default:
result = AE_BAD_PARAMETER; result = AE_BAD_PARAMETER;
break; break;
} }
} }
DEBUG_FUNCTION_VF("sem: %ld; count: %lu; timeout: %u result: %lu", DEBUG_FUNCTION_VF("sem: %ld; count: %lu; timeout: %u result: %lu",
handle, units, timeout, (uint32)result); handle, units, timeout, (uint32)result);
@@ -644,7 +644,7 @@ AcpiOsCreateLock(ACPI_SPINLOCK *outHandle)
DEBUG_FUNCTION_F("result: %p", *outHandle); DEBUG_FUNCTION_F("result: %p", *outHandle);
if (*outHandle == NULL) if (*outHandle == NULL)
return AE_NO_MEMORY; return AE_NO_MEMORY;
**outHandle = B_SPINLOCK_INITIALIZER; **outHandle = B_SPINLOCK_INITIALIZER;
return AE_OK; return AE_OK;
} }
@@ -665,7 +665,7 @@ AcpiOsAcquireLock(ACPI_SPINLOCK handle)
DEBUG_FUNCTION_F("spinlock: %p", handle); DEBUG_FUNCTION_F("spinlock: %p", handle);
cpu = disable_interrupts(); cpu = disable_interrupts();
acquire_spinlock(handle); acquire_spinlock(handle);
return cpu; return cpu;
} }
@@ -709,7 +709,7 @@ AcpiOsInstallInterruptHandler(UINT32 interruptNumber,
DEBUG_FUNCTION_F("vector: %lu; handler: %p context %p returned %d", DEBUG_FUNCTION_F("vector: %lu; handler: %p context %p returned %d",
interruptNumber, serviceRoutine, context, result); interruptNumber, serviceRoutine, context, result);
return result == B_OK ? AE_OK : AE_BAD_PARAMETER; return result == B_OK ? AE_OK : AE_BAD_PARAMETER;
#else #else
return AE_BAD_PARAMETER; return AE_BAD_PARAMETER;
@@ -774,6 +774,12 @@ AcpiOsExecute(ACPI_EXECUTE_TYPE type, ACPI_OSD_EXEC_CALLBACK function,
break; break;
} }
*/ */
if (!gDPCHandle && gDPC->new_dpc_queue(&gDPCHandle, "acpi_task",
B_NORMAL_PRIORITY) != B_OK) {
DEBUG_FUNCTION_F("failed to create os execution queue\n");
return AE_ERROR;
}
if (gDPC->queue_dpc(gDPCHandle, function, context) != B_OK) { if (gDPC->queue_dpc(gDPCHandle, function, context) != B_OK) {
DEBUG_FUNCTION_F("Serious failure in AcpiOsExecute! function: %p", DEBUG_FUNCTION_F("Serious failure in AcpiOsExecute! function: %p",
function); function);
@@ -934,7 +940,7 @@ AcpiOsWritePciConfiguration(ACPI_PCI_ID *pciId, UINT32 reg,
void void
AcpiOsDerivePciId(ACPI_HANDLE rhandle, ACPI_HANDLE chandle, ACPI_PCI_ID **pciId) AcpiOsDerivePciId(ACPI_HANDLE rhandle, ACPI_HANDLE chandle, ACPI_PCI_ID **pciId)
{ {
// TODO: Implement this! // TODO: Implement this!
} }
@@ -1105,7 +1111,7 @@ AcpiOsReadable(void *pointer, ACPI_SIZE length)
id = area_for(pointer); id = area_for(pointer);
if (id == B_ERROR) return false; if (id == B_ERROR) return false;
if (get_area_info(id, &info) != B_OK) return false; if (get_area_info(id, &info) != B_OK) return false;
return (info.protection & B_READ_AREA) != 0 && return (info.protection & B_READ_AREA) != 0 &&
pointer + length <= info.address + info.ram_size; pointer + length <= info.address + info.ram_size;
#endif #endif
} }
@@ -1138,7 +1144,7 @@ AcpiOsWritable(void *pointer, ACPI_SIZE length)
if (id == B_ERROR) return false; if (id == B_ERROR) return false;
if (get_area_info(id, &info) != B_OK) return false; if (get_area_info(id, &info) != B_OK) return false;
return (info.protection & B_READ_AREA) != 0 && return (info.protection & B_READ_AREA) != 0 &&
(info.protection & B_WRITE_AREA) != 0 && (info.protection & B_WRITE_AREA) != 0 &&
pointer + length <= info.address + info.ram_size; pointer + length <= info.address + info.ram_size;
#endif #endif
} }
@@ -1232,7 +1238,7 @@ AcpiOsAcquireGlobalLock(uint32 *lock)
old = *lock; old = *lock;
new = ((old & ~GL_BIT_MASK) | GL_BIT_OWNED) | new = ((old & ~GL_BIT_MASK) | GL_BIT_OWNED) |
((old >> 1) & GL_BIT_PENDING); ((old >> 1) & GL_BIT_PENDING);
atomic_test_and_set(lock, new, old); atomic_test_and_set(lock, new, old);
} while (*lock == old); } while (*lock == old);
return ((new < GL_BIT_MASK) ? GL_ACQUIRED : GL_BUSY); return ((new < GL_BIT_MASK) ? GL_ACQUIRED : GL_BUSY);
} }