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

moved get_device_hid call, weirdly it compiled ok with gcc4

Browse Source 
removed config driver, added acpi as a boot module
removed a duplicate etherpci


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19323 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2006-11-18 21:51:37 +00:00
parent ea71f2e7b8
commit 37477ce91d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+3 -3
View File
@@ -95,7 +95,7 @@ BEOS_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon.driver $(X86_ONLY)nv.driver
; ;
BEOS_ADD_ONS_DRIVERS_MIDI = emuxki ; BEOS_ADD_ONS_DRIVERS_MIDI = emuxki ;
BEOS_ADD_ONS_DRIVERS_NET = etherpci ipro1000 rtl8139 rtl8169 sis900 BEOS_ADD_ONS_DRIVERS_NET = etherpci ipro1000 rtl8139 rtl8169 sis900
etherpci via-rhine wb840 net_stack via-rhine wb840 net_stack
$(GPL_ONLY)bcm440x $(GPL_ONLY)bcm570x $(GPL_ONLY)bcm440x $(GPL_ONLY)bcm570x
; ;
BEOS_ADD_ONS_DRIVERS_ACPI = $(X86_ONLY)acpi_button $(X86_ONLY)acpi_ns_dump ; BEOS_ADD_ONS_DRIVERS_ACPI = $(X86_ONLY)acpi_button $(X86_ONLY)acpi_ns_dump ;
@@ -133,7 +133,7 @@ AddDriversToHaikuImage bus : usb_raw ;
AddDriversToHaikuImage disk scsi : scsi_cd scsi_dsk ; AddDriversToHaikuImage disk scsi : scsi_cd scsi_dsk ;
AddDriversToHaikuImage graphics : $(BEOS_ADD_ONS_DRIVERS_GRAPHICS) ; AddDriversToHaikuImage graphics : $(BEOS_ADD_ONS_DRIVERS_GRAPHICS) ;
AddDriversToHaikuImage input : ps2_hid usb_hid ; AddDriversToHaikuImage input : ps2_hid usb_hid ;
AddDriversToHaikuImage misc : <driver>config <driver>poke ; AddDriversToHaikuImage misc : <driver>poke ;
AddDriversToHaikuImage net : $(BEOS_ADD_ONS_DRIVERS_NET) ; AddDriversToHaikuImage net : $(BEOS_ADD_ONS_DRIVERS_NET) ;
AddDriversToHaikuImage power : $(BEOS_ADD_ONS_DRIVERS_ACPI) ; AddDriversToHaikuImage power : $(BEOS_ADD_ONS_DRIVERS_ACPI) ;
@@ -239,7 +239,7 @@ AddFilesToHaikuImage home config settings : <keymap>US-International : Key_map ;
AddFilesToHaikuImage beos system : zbeos ; AddFilesToHaikuImage beos system : zbeos ;
# boot module links # boot module links
AddBootModuleSymlinks config_manager bfs block_io fast_log generic_ide_pci AddBootModuleSymlinks $(X86_ONLY)acpi config_manager bfs block_io fast_log generic_ide_pci
$(X86_ONLY)isa ide ide_adapter $(X86_ONLY)ide_isa intel locked_pool $(X86_ONLY)isa ide ide_adapter $(X86_ONLY)ide_isa intel locked_pool
$(PPC_ONLY)openpic pci scsi scsi_cd scsi_dsk scsi_periph $(PPC_ONLY)openpic pci scsi scsi_cd scsi_dsk scsi_periph
silicon_image_3112 silicon_image_3112
src/add-ons/kernel/bus_managers/acpi/acpi_module.c
+1 -1
View File
@@ -76,7 +76,6 @@ acpi_enumerate_child_devices(device_node_handle node, const char *root)
switch (type) { switch (type) {
case ACPI_TYPE_DEVICE: { case ACPI_TYPE_DEVICE: {
char hid[9] = ""; char hid[9] = "";
get_device_hid(result, hid);
device_attr attrs[] = { device_attr attrs[] = {
// info about device // info about device
{ B_DRIVER_MODULE, B_STRING_TYPE, { string: ACPI_DEVICE_MODULE_NAME }}, { B_DRIVER_MODULE, B_STRING_TYPE, { string: ACPI_DEVICE_MODULE_NAME }},
@@ -94,6 +93,7 @@ acpi_enumerate_child_devices(device_node_handle node, const char *root)
{ B_DRIVER_BUS, B_STRING_TYPE, { string: "apci" }}, { B_DRIVER_BUS, B_STRING_TYPE, { string: "apci" }},
{ NULL } { NULL }
}; };
get_device_hid(result, hid);
if (gDeviceManager->register_device(node, attrs, NULL, &deviceNode) == B_OK) if (gDeviceManager->register_device(node, attrs, NULL, &deviceNode) == B_OK)
acpi_enumerate_child_devices(deviceNode, result); acpi_enumerate_child_devices(deviceNode, result);