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

"char string[9]; string[9] = 0;" -> not nice. Enabled getting the device hid again, as it works correctly now

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28501 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2008-11-04 16:27:49 +00:00
parent 77817877ce
commit 7f1f15f775
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/acpi/acpi_module.c
+1 -1
View File
@@ -88,7 +88,7 @@ acpi_enumerate_child_devices(device_node *node, const char *root)
switch (type) { switch (type) {
case ACPI_TYPE_DEVICE: { case ACPI_TYPE_DEVICE: {
char hid[9] = ""; char hid[16] = "";
device_attr attrs[] = { device_attr attrs[] = {
// info about device // info about device
{ B_DEVICE_BUS, B_STRING_TYPE, { string: "acpi" }}, { B_DEVICE_BUS, B_STRING_TYPE, { string: "acpi" }},
src/add-ons/kernel/bus_managers/acpi/acpi_ns_dump.cpp
+6 -18
View File
@@ -54,17 +54,13 @@ make_space(acpi_ns_device_info *device, size_t space)
device->buffer->Unlock(); device->buffer->Unlock();
if (!released) { if (!released) {
//dprintf("try to release\n"); if (release_sem_etc(device->read_sem, 1, B_RELEASE_IF_WAITING_ONLY) == B_OK)
if (release_sem_etc(device->read_sem, 1, B_RELEASE_IF_WAITING_ONLY) == B_OK) {
//dprintf("released\n");
released = true; released = true;
}
} }
snooze(10000); snooze(10000);
if (!device->buffer->Lock()) { if (!device->buffer->Lock())
return false; return false;
}
} while (device->buffer->WritableAmount() < space); } while (device->buffer->WritableAmount() < space);
@@ -77,12 +73,12 @@ static void
dump_acpi_namespace(acpi_ns_device_info *device, char *root, int indenting) dump_acpi_namespace(acpi_ns_device_info *device, char *root, int indenting)
{ {
char result[255]; char result[255];
char output[255]; char output[320];
char tabs[255]; char tabs[255];
char hid[9]; char hid[16];
int i; int i;
size_t written = 0; size_t written = 0;
hid[8] = '\0'; hid[0] = '\0';
tabs[0] = '\0'; tabs[0] = '\0';
for (i = 0; i < indenting; i++) for (i = 0; i < indenting; i++)
strlcat(tabs, "| ", sizeof(tabs)); strlcat(tabs, "| ", sizeof(tabs));
@@ -112,8 +108,7 @@ dump_acpi_namespace(acpi_ns_device_info *device, char *root, int indenting)
snprintf(output, sizeof(output), "%s FIELD UNIT", output); snprintf(output, sizeof(output), "%s FIELD UNIT", output);
break; break;
case ACPI_TYPE_DEVICE: case ACPI_TYPE_DEVICE:
// TODO: Commented out for the time being, since it screws the output device->acpi->get_device_hid(result, hid);
//device->acpi->get_device_hid(result, hid);
snprintf(output, sizeof(output), "%s DEVICE (%s)", output, hid); snprintf(output, sizeof(output), "%s DEVICE (%s)", output, hid);
break; break;
case ACPI_TYPE_EVENT: case ACPI_TYPE_EVENT:
@@ -175,13 +170,6 @@ acpi_namespace_dump(void *arg)
{ {
acpi_ns_device_info *device = (acpi_ns_device_info*)(arg); acpi_ns_device_info *device = (acpi_ns_device_info*)(arg);
dump_acpi_namespace(device, NULL, 0); dump_acpi_namespace(device, NULL, 0);
if (device->buffer->Lock()) {
size_t writable = device->buffer->WritableAmount();
if (writable < 1)
make_space(device, 1);
device->buffer->Write("\n", 1);
device->buffer->Unlock();
}
delete_sem(device->read_sem); delete_sem(device->read_sem);
device->read_sem = -1; device->read_sem = -1;