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

Use strcpy, fix style issues.

Browse Source
This commit is contained in:
Fredrik Holmqvist
2014-08-28 19:54:37 +02:00
parent 34dbbb65fd
commit f63a0d873e
1 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
+6 -11
View File
@@ -88,7 +88,7 @@ get_device_by_hid_callback(ACPI_HANDLE object, UINT32 depth, void* context,
static void static void
globalGPEHandler(UINT32 eventType, ACPI_HANDLE device, UINT32 eventNumber, globalGPEHandler(UINT32 eventType, ACPI_HANDLE device, UINT32 eventNumber,
void *context) void* context)
{ {
ACPI_BUFFER path; ACPI_BUFFER path;
char deviceName[256]; char deviceName[256];
@@ -96,12 +96,8 @@ globalGPEHandler(UINT32 eventType, ACPI_HANDLE device, UINT32 eventNumber,
path.Pointer = deviceName; path.Pointer = deviceName;
ACPI_STATUS status = AcpiNsHandleToPathname(device, &path); ACPI_STATUS status = AcpiNsHandleToPathname(device, &path);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status))
deviceName[0] = '?'; strcpy("(missing)", deviceName);
deviceName[1] = '?';
deviceName[2] = '?';
deviceName[3] = 0;
}
switch (eventType) { switch (eventType) {
case ACPI_EVENT_TYPE_GPE: case ACPI_EVENT_TYPE_GPE:
@@ -110,7 +106,7 @@ globalGPEHandler(UINT32 eventType, ACPI_HANDLE device, UINT32 eventNumber,
case ACPI_EVENT_TYPE_FIXED: case ACPI_EVENT_TYPE_FIXED:
{ {
switch(eventNumber) { switch (eventNumber) {
case ACPI_EVENT_PMTIMER: case ACPI_EVENT_PMTIMER:
dprintf("acpi: PMTIMER(%d) event for %s\n", eventNumber, dprintf("acpi: PMTIMER(%d) event for %s\n", eventNumber,
deviceName); deviceName);
@@ -140,7 +136,8 @@ globalGPEHandler(UINT32 eventType, ACPI_HANDLE device, UINT32 eventNumber,
dprintf("acpi: unknown fixed(%d) event for %s\n", dprintf("acpi: unknown fixed(%d) event for %s\n",
eventNumber, deviceName); eventNumber, deviceName);
} }
} break; break;
}
default: default:
dprintf("acpi: unknown event type (%d:%d) event for %s\n", dprintf("acpi: unknown event type (%d:%d) event for %s\n",
@@ -246,7 +243,6 @@ acpi_std_ops(int32 op,...)
"AcpiInitializeObjects failed")) "AcpiInitializeObjects failed"))
goto err; goto err;
checkAndLogFailure( checkAndLogFailure(
AcpiInstallGlobalEventHandler(globalGPEHandler, NULL), AcpiInstallGlobalEventHandler(globalGPEHandler, NULL),
"Failed to install global GPE handler."); "Failed to install global GPE handler.");
@@ -257,7 +253,6 @@ acpi_std_ops(int32 op,...)
checkAndLogFailure(AcpiUpdateAllGpes(), checkAndLogFailure(AcpiUpdateAllGpes(),
"Failed to update all Gpes"); "Failed to update all Gpes");
/* Phew. Now in ACPI mode */
TRACE("ACPI initialized\n"); TRACE("ACPI initialized\n");
return B_OK; return B_OK;