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

Fix compilation after rename and switch to cpp.

Browse Source
This commit is contained in:
Fredrik Holmqvist
2012-07-14 22:19:31 +02:00
parent 775afec4cc
commit cad6c2c536
7 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/acpi/ACPIPrivate.h
+3 -3
View File
@@ -3,8 +3,8 @@
* Copyright 2006, Jérôme Duval. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef __ACPI_PRIV_H__
#define __ACPI_PRIV_H__
#ifndef _ACPI_PRIVATE_H
#define _ACPI_PRIVATE_H
#include <sys/cdefs.h>
@@ -227,4 +227,4 @@ status_t get_table(const char* signature, uint32 instance, void** tableHeader);
__END_DECLS
#endif /* __ACPI_PRIV_H__ */
#endif /* _ACPI_PRIVATE_H */
src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
+9 -7
View File
@@ -20,11 +20,13 @@
#include <safemode.h>
extern "C" {
#include "acpi.h"
#include "accommon.h"
#include "acdisasm.h"
#include "acnamesp.h"
#include "acpi_priv.h"
}
#include "ACPIPrivate.h"
//#define TRACE_ACPI_BUS
#ifdef TRACE_ACPI_BUS
@@ -384,7 +386,7 @@ status_t
install_fixed_event_handler(uint32 event, interrupt_handler* handler,
void *data)
{
return AcpiInstallFixedEventHandler(event, (void*)handler, data) == AE_OK
return AcpiInstallFixedEventHandler(event, (ACPI_EVENT_HANDLER)handler, data) == AE_OK
? B_OK : B_ERROR;
}
@@ -392,7 +394,7 @@ install_fixed_event_handler(uint32 event, interrupt_handler* handler,
status_t
remove_fixed_event_handler(uint32 event, interrupt_handler* handler)
{
return AcpiRemoveFixedEventHandler(event, (void*)handler) == AE_OK
return AcpiRemoveFixedEventHandler(event, (ACPI_EVENT_HANDLER)handler) == AE_OK
? B_OK : B_ERROR;
}
@@ -441,7 +443,7 @@ get_device(const char* hid, uint32 index, char* result, size_t resultLength)
char *buffer = NULL;
TRACE("get_device %s, index %ld\n", hid, index);
status = AcpiGetDevices((ACPI_STRING)hid, (void*)&get_device_by_hid_callback,
status = AcpiGetDevices((ACPI_STRING)hid, (ACPI_WALK_CALLBACK)&get_device_by_hid_callback,
counter, (void**)&buffer);
if (status != AE_OK || buffer == NULL)
return B_ENTRY_NOT_FOUND;
@@ -523,7 +525,7 @@ get_object(const char* path, acpi_object_type** _returnValue)
status = AcpiEvaluateObject(handle, NULL, NULL, &buffer);
*_returnValue = buffer.Pointer;
*_returnValue = (acpi_object_type*)buffer.Pointer;
return status == AE_OK ? B_OK : B_ERROR;
}
@@ -545,7 +547,7 @@ get_object_typed(const char* path, acpi_object_type** _returnValue,
status = AcpiEvaluateObjectTyped(handle, NULL, NULL, &buffer, objectType);
*_returnValue = buffer.Pointer;
*_returnValue = (acpi_object_type*)buffer.Pointer;
return status == AE_OK ? B_OK : B_ERROR;
}
@@ -642,7 +644,7 @@ prepare_sleep_state(uint8 state, void (*wakeFunc)(void), size_t size)
status_t status;
// Note: The supplied code must already be locked into memory.
status = get_memory_map(wakeFunc, size, &wakeVector, 1);
status = get_memory_map((const void*)wakeFunc, size, &wakeVector, 1);
if (status != B_OK)
return status;
src/add-ons/kernel/bus_managers/acpi/Device.cpp
+18 -21
View File
@@ -9,8 +9,10 @@
#include <stdio.h>
#include <stdlib.h>
#include "acpi_priv.h"
#include "ACPIPrivate.h"
extern "C" {
#include "acpi.h"
}
static status_t
@@ -43,17 +45,17 @@ acpi_remove_address_space_handler(acpi_device device, uint32 spaceId,
{
return remove_address_space_handler(device->handle, spaceId, handler);
}
static uint32
static uint32
acpi_get_object_type(acpi_device device)
{
return device->type;
}
static status_t
acpi_get_object(acpi_device device, const char *path, acpi_object_type **return_value)
static status_t
acpi_get_object(acpi_device device, const char *path, acpi_object_type **return_value)
{
if (path) {
char objname[255];
@@ -64,9 +66,9 @@ acpi_get_object(acpi_device device, const char *path, acpi_object_type **return_
}
static status_t
static status_t
acpi_evaluate_method(acpi_device device, const char *method,
acpi_objects *args, acpi_data *returnValue)
acpi_objects *args, acpi_data *returnValue)
{
return evaluate_method(device->handle, method, args, returnValue);
}
@@ -77,19 +79,17 @@ acpi_device_init_driver(device_node *node, void **cookie)
{
ACPI_HANDLE handle;
const char *path;
acpi_device_cookie *device;
status_t status = B_OK;
uint32 type;
if (gDeviceManager->get_attr_uint32(node, ACPI_DEVICE_TYPE_ITEM, &type, false) != B_OK)
return B_ERROR;
if (gDeviceManager->get_attr_string(node, ACPI_DEVICE_PATH_ITEM, &path, false) != B_OK)
return B_ERROR;
device = malloc(sizeof(*device));
acpi_device_cookie *device = (acpi_device_cookie*)malloc(sizeof(*device));
if (device == NULL)
return B_NO_MEMORY;
memset(device, 0, sizeof(*device));
if (AcpiGetHandle(NULL, (ACPI_STRING)path, &handle) != AE_OK) {
@@ -102,20 +102,17 @@ acpi_device_init_driver(device_node *node, void **cookie)
device->type = type;
device->node = node;
snprintf(device->name, sizeof(device->name), "acpi_device %s",
path);
snprintf(device->name, sizeof(device->name), "acpi_device %s", path);
*cookie = device;
return status;
return B_OK;
}
static void
acpi_device_uninit_driver(void *cookie)
{
acpi_device_cookie *device = cookie;
acpi_device_cookie *device = (acpi_device_cookie*)cookie;
free(device->path);
free(device);
}
@@ -133,7 +130,7 @@ acpi_device_std_ops(int32 op, ...)
return B_BAD_VALUE;
}
acpi_device_module_info gACPIDeviceModule = {
{
{
src/add-ons/kernel/bus_managers/acpi/EmbeddedController.cpp
+2 -2
View File
@@ -28,7 +28,7 @@
*/
#include "acpi_embedded_controller.h"
#include "EmbeddedController.h"
#include <kernel.h>
#include <stdio.h>
@@ -555,7 +555,7 @@ EcGpeQueryHandler(void* context)
if (status != B_OK) {
TRACE("evaluation of query method %s failed\n", qxx);
}
// Reenable runtime GPE if its execution was deferred.
if (sci_enqueued) {
status = sc->ec_acpi_module->finish_gpe(sc->ec_gpehandle, sc->ec_gpebit);
src/add-ons/kernel/bus_managers/acpi/EmbeddedController.h
+1 -1
View File
@@ -44,7 +44,7 @@ extern "C" {
# include "accommon.h"
# include "acnamesp.h"
# include "actypes.h"
# include "acpi_priv.h"
# include "ACPIPrivate.h"
}
src/add-ons/kernel/bus_managers/acpi/Module.cpp
+2 -2
View File
@@ -9,7 +9,7 @@
#include <stdlib.h>
#include <string.h>
#include "acpi_priv.h"
#include "ACPIPrivate.h"
#include <dpc.h>
#include <PCI.h>
@@ -126,7 +126,7 @@ acpi_enumerate_child_devices(device_node* node, const char* root)
static status_t
acpi_module_register_child_devices(void* cookie)
{
device_node* node = cookie;
device_node* node = (device_node*)cookie;
status_t status = gDeviceManager->publish_device(node, "acpi/namespace",
ACPI_NS_DUMP_DEVICE_MODULE_NAME);
src/add-ons/kernel/bus_managers/acpi/NamespaceDump.cpp
+13 -13
View File
@@ -1,5 +1,5 @@
/* ++++++++++
ACPI namespace dump.
ACPI namespace dump.
Nothing special here, just tree enumeration and type identification.
+++++ */
@@ -9,7 +9,7 @@
#include <stdlib.h>
#include <string.h>
#include "acpi_priv.h"
#include "ACPIPrivate.h"
#include <util/kernel_cpp.h>
#include <util/ring_buffer.h>
@@ -17,7 +17,7 @@
class RingBuffer {
public:
RingBuffer(size_t size = 1024);
~RingBuffer();
~RingBuffer();
size_t Read(void *buffer, ssize_t length);
size_t Write(const void *buffer, ssize_t length);
size_t WritableAmount() const;
@@ -60,18 +60,18 @@ make_space(acpi_ns_device_info *device, size_t space)
}
snooze(10000);
if (!device->buffer->Lock())
if (!device->buffer->Lock())
return false;
} while (device->buffer->WritableAmount() < space);
return true;
}
}
static void
dump_acpi_namespace(acpi_ns_device_info *device, char *root, int indenting)
static void
dump_acpi_namespace(acpi_ns_device_info *device, char *root, int indenting)
{
char result[255];
char output[320];
@@ -79,13 +79,13 @@ dump_acpi_namespace(acpi_ns_device_info *device, char *root, int indenting)
char hid[16] = "";
int i;
size_t written = 0;
for (i = 0; i < indenting; i++)
for (i = 0; i < indenting; i++)
strlcat(tabs, "| ", sizeof(tabs));
strlcat(tabs, "|--- ", sizeof(tabs));
int depth = sizeof(char) * 5 * indenting + sizeof(char); // index into result where the device name will be.
void *counter = NULL;
while (device->acpi->get_next_entry(ACPI_TYPE_ANY, root, result, 255, &counter) == B_OK) {
uint32 type = device->acpi->get_object_type(result);
@@ -142,13 +142,13 @@ dump_acpi_namespace(acpi_ns_device_info *device, char *root, int indenting)
written = 0;
RingBuffer &ringBuffer = *device->buffer;
size_t toWrite = strlen(output);
if (toWrite <= 0)
break;
strlcat(output, "\n", sizeof(output));
toWrite++;
if (!ringBuffer.Lock())
if (!ringBuffer.Lock())
break;
if (ringBuffer.WritableAmount() < toWrite &&