From a9bd2efd90725cf30a37f32c8820798b4b22abbd Mon Sep 17 00:00:00 2001 From: Fredrik Holmqvist Date: Thu, 14 Apr 2022 21:12:43 +0200 Subject: [PATCH] Delete config_manager Change-Id: Ie909c9a22750c33fcb1dd7824e8b3e51c4d86572 Reviewed-on: https://review.haiku-os.org/c/haiku/+/5208 Reviewed-by: Adrien Destugues --- build/jam/ArchitectureRules | 1 - build/jam/images/FloppyBootImage | 2 +- build/jam/images/NetBootArchive | 2 +- build/jam/images/definitions/minimum | 1 - build/jam/packages/Haiku | 1 - build/jam/packages/HaikuBootstrap | 2 +- headers/os/drivers/config_manager.h | 117 ------------ src/add-ons/kernel/bus_managers/Jamfile | 1 - .../bus_managers/config_manager/Jamfile | 11 -- .../config_manager/arch/arm/Jamfile | 8 - .../config_manager/arch/arm64/Jamfile | 8 - .../config_manager/arch/m68k/Jamfile | 12 -- .../arch/m68k/amiga_hardcoded.c | 42 ----- .../arch/m68k/atari_hardcoded.c | 42 ----- .../arch/m68k/config_manager_arch.c | 22 --- .../arch/m68k/config_manager_arch.h | 29 --- .../config_manager/arch/ppc/Jamfile | 10 - .../arch/ppc/config_manager_arch.c | 18 -- .../config_manager/arch/riscv64/Jamfile | 10 - .../arch/riscv64/config_manager_arch.c | 18 -- .../config_manager/arch/sparc/Jamfile | 11 -- .../arch/sparc/config_manager_arch.c | 18 -- .../config_manager/arch/x86/Jamfile | 10 - .../arch/x86/config_manager_arch.c | 18 -- .../config_manager/config_manager.c | 173 ------------------ src/add-ons/kernel/drivers/misc/Jamfile | 4 - src/add-ons/kernel/drivers/misc/config.c | 164 ----------------- .../kernel/drivers/misc/config_driver.h | 38 ---- 28 files changed, 3 insertions(+), 790 deletions(-) delete mode 100644 headers/os/drivers/config_manager.h delete mode 100644 src/add-ons/kernel/bus_managers/config_manager/Jamfile delete mode 100644 src/add-ons/kernel/bus_managers/config_manager/arch/arm/Jamfile delete mode 100644 src/add-ons/kernel/bus_managers/config_manager/arch/arm64/Jamfile delete mode 100644 src/add-ons/kernel/bus_managers/config_manager/arch/m68k/Jamfile delete mode 100644 src/add-ons/kernel/bus_managers/config_manager/arch/m68k/amiga_hardcoded.c delete mode 100644 src/add-ons/kernel/bus_managers/config_manager/arch/m68k/atari_hardcoded.c delete mode 100644 src/add-ons/kernel/bus_managers/config_manager/arch/m68k/config_manager_arch.c delete mode 100644 src/add-ons/kernel/bus_managers/config_manager/arch/m68k/config_manager_arch.h delete mode 100644 src/add-ons/kernel/bus_managers/config_manager/arch/ppc/Jamfile delete mode 100644 src/add-ons/kernel/bus_managers/config_manager/arch/ppc/config_manager_arch.c delete mode 100644 src/add-ons/kernel/bus_managers/config_manager/arch/riscv64/Jamfile delete mode 100644 src/add-ons/kernel/bus_managers/config_manager/arch/riscv64/config_manager_arch.c delete mode 100644 src/add-ons/kernel/bus_managers/config_manager/arch/sparc/Jamfile delete mode 100644 src/add-ons/kernel/bus_managers/config_manager/arch/sparc/config_manager_arch.c delete mode 100644 src/add-ons/kernel/bus_managers/config_manager/arch/x86/Jamfile delete mode 100644 src/add-ons/kernel/bus_managers/config_manager/arch/x86/config_manager_arch.c delete mode 100644 src/add-ons/kernel/bus_managers/config_manager/config_manager.c delete mode 100644 src/add-ons/kernel/drivers/misc/config.c delete mode 100644 src/add-ons/kernel/drivers/misc/config_driver.h diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules index e7dc2235ee..1cdf4da149 100644 --- a/build/jam/ArchitectureRules +++ b/build/jam/ArchitectureRules @@ -670,7 +670,6 @@ rule ArchitectureSetupWarnings architecture EnableWerror src add-ons kernel bus_managers acpi ; EnableWerror src add-ons kernel bus_managers agp_gart ; EnableWerror src add-ons kernel bus_managers ata ; - EnableWerror src add-ons kernel bus_managers config_manager ; EnableWerror src add-ons kernel bus_managers firewire ; EnableWerror src add-ons kernel bus_managers ide ; EnableWerror src add-ons kernel bus_managers isa ; diff --git a/build/jam/images/FloppyBootImage b/build/jam/images/FloppyBootImage index 8f27b360d4..575f88a345 100644 --- a/build/jam/images/FloppyBootImage +++ b/build/jam/images/FloppyBootImage @@ -26,7 +26,7 @@ if $(NET_BOOT) = 1 { } SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures - acpi@x86,x86_64 ata config_manager dpc pci + acpi@x86,x86_64 ata dpc pci isa@x86,x86_64 scsi $(USB_ONLY)usb fdt@arm ] ; SYSTEM_ADD_ONS_FILE_SYSTEMS = diff --git a/build/jam/images/NetBootArchive b/build/jam/images/NetBootArchive index 9ab8e78e94..e3402eead9 100644 --- a/build/jam/images/NetBootArchive +++ b/build/jam/images/NetBootArchive @@ -20,7 +20,7 @@ SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures ] ; SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures pci isa@x86 ata - scsi config_manager agp_gart + scsi agp_gart ] ; SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs packagefs ; diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum index 97856899a4..2959038289 100644 --- a/build/jam/images/definitions/minimum +++ b/build/jam/images/definitions/minimum @@ -225,7 +225,6 @@ SYSTEM_ADD_ONS_DRIVERS_SENSOR = [ FFilterByBuildFeatures SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures acpi@x86,x86_64 agp_gart@x86,x86_64 ata - config_manager i2c@x86,x86_64 isa@x86,x86_64 mmc scsi diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku index fdc6a61422..ef37c3d084 100644 --- a/build/jam/packages/Haiku +++ b/build/jam/packages/Haiku @@ -195,7 +195,6 @@ AddFilesToPackage data KeyboardLayouts ThinkPad AddBootModuleSymlinksToPackage acpi@x86,x86_64 ahci ata ata_adapter bfs - config_manager dpc efi_gpt generic_ide_pci diff --git a/build/jam/packages/HaikuBootstrap b/build/jam/packages/HaikuBootstrap index 19bde79c9f..7b10424cb9 100644 --- a/build/jam/packages/HaikuBootstrap +++ b/build/jam/packages/HaikuBootstrap @@ -161,7 +161,7 @@ AddFilesToPackage data KeyboardLayouts ThinkPad # boot module links AddBootModuleSymlinksToPackage - acpi@x86,x86_64 ata pci isa@x86,x86_64 config_manager dpc + acpi@x86,x86_64 ata pci isa@x86,x86_64 dpc scsi usb openpic@ppc ata_adapter locked_pool scsi_periph diff --git a/headers/os/drivers/config_manager.h b/headers/os/drivers/config_manager.h deleted file mode 100644 index b97a4e761c..0000000000 --- a/headers/os/drivers/config_manager.h +++ /dev/null @@ -1,117 +0,0 @@ -#ifndef _CONFIG_MANAGER_H -#define _CONFIG_MANAGER_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -typedef enum { - B_ISA_BUS, - B_PCI_BUS, - B_PCMCIA_BUS, - B_UNKNOWN_BUS = 0x80 -} bus_type; - -typedef struct { - uchar base; - uchar subtype; - uchar interface; -} device_type; - -typedef struct { - uint32 mask; - uint32 flags; - uint32 cookie; -} resource_mask_descriptor; - -typedef struct { - uint32 minbase; - uint32 maxbase; - uint32 basealign; - uint32 len; - uint32 flags; - uint32 cookie; -} resource_range_descriptor; - -typedef enum { - B_IRQ_RESOURCE, - B_DMA_RESOURCE, - B_IO_PORT_RESOURCE, - B_MEMORY_RESOURCE -} resource_type; - -typedef struct { - resource_type type; - union { - resource_mask_descriptor m; - resource_range_descriptor r; - uint32 for_padding[7]; - } d; -} resource_descriptor; - -struct device_configuration { - uint32 flags; - uint32 num_resources; - resource_descriptor resources[0]; -}; - -struct possible_device_configurations { - uint32 flags; - uint32 num_possible; - struct device_configuration possible[0]; -}; - -struct device_info { - uint32 size; - uint32 bus_dependent_info_offset; - bus_type bus; - device_type devtype; - uint32 id[4]; /* unique (per-bus) normally-persistent id for device */ - uint32 flags; - status_t config_status; - - /* bus-dependent data goes here... */ -}; - -#define B_DEVICE_INFO_ENABLED 1 -#define B_DEVICE_INFO_CONFIGURED 2 -#define B_DEVICE_INFO_CAN_BE_DISABLED 4 - -typedef struct config_manager_for_driver_module_info { - module_info minfo; - - status_t (*get_next_device_info)(bus_type bus, uint64 *cookie, - struct device_info *info, uint32 len); - status_t (*get_device_info_for)(uint64 device, - struct device_info *info, uint32 len); - - status_t (*get_size_of_current_configuration_for)(uint64 device); - status_t (*get_current_configuration_for)(uint64 device, - struct device_configuration *config, uint32 len); - - status_t (*get_size_of_possible_configurations_for)(uint64 device); - status_t (*get_possible_configurations_for)(uint64 device, - struct possible_device_configurations *possible, - uint32 len); - - /* helper routines for drivers */ - status_t (*count_resource_descriptors_of_type)( - const struct device_configuration *config, - resource_type type); - status_t (*get_nth_resource_descriptor_of_type)( - const struct device_configuration *config, uint32 n, - resource_type type, resource_descriptor *descriptor, - uint32 len); -} config_manager_for_driver_module_info; - -int config_manager_scan_hardcoded(struct device_info **info, int32 *count); - -#define B_CONFIG_MANAGER_FOR_DRIVER_MODULE_NAME "bus_managers/config_manager/driver/v1" - -#ifdef __cplusplus -} -#endif - -#endif /* _CONFIG_MANAGER_H */ diff --git a/src/add-ons/kernel/bus_managers/Jamfile b/src/add-ons/kernel/bus_managers/Jamfile index 616b52e161..988ec429bd 100644 --- a/src/add-ons/kernel/bus_managers/Jamfile +++ b/src/add-ons/kernel/bus_managers/Jamfile @@ -3,7 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel bus_managers ; SubInclude HAIKU_TOP src add-ons kernel bus_managers acpi ; SubInclude HAIKU_TOP src add-ons kernel bus_managers agp_gart ; SubInclude HAIKU_TOP src add-ons kernel bus_managers ata ; -SubInclude HAIKU_TOP src add-ons kernel bus_managers config_manager ; SubInclude HAIKU_TOP src add-ons kernel bus_managers fdt ; SubInclude HAIKU_TOP src add-ons kernel bus_managers firewire ; SubInclude HAIKU_TOP src add-ons kernel bus_managers i2c ; diff --git a/src/add-ons/kernel/bus_managers/config_manager/Jamfile b/src/add-ons/kernel/bus_managers/config_manager/Jamfile deleted file mode 100644 index dc747dd000..0000000000 --- a/src/add-ons/kernel/bus_managers/config_manager/Jamfile +++ /dev/null @@ -1,11 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel bus_managers config_manager ; - -UsePrivateHeaders kernel ; - -KernelAddon config_manager : - config_manager.c - : config_manager_arch.a - ; - -SubInclude HAIKU_TOP src add-ons kernel bus_managers config_manager arch - $(TARGET_KERNEL_ARCH_DIR) ; diff --git a/src/add-ons/kernel/bus_managers/config_manager/arch/arm/Jamfile b/src/add-ons/kernel/bus_managers/config_manager/arch/arm/Jamfile deleted file mode 100644 index e6687d7eb7..0000000000 --- a/src/add-ons/kernel/bus_managers/config_manager/arch/arm/Jamfile +++ /dev/null @@ -1,8 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel bus_managers config_manager arch $(TARGET_ARCH) ; - -SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ; - -UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_ARCH) ] ; - -KernelStaticLibrary config_manager_arch : - ; diff --git a/src/add-ons/kernel/bus_managers/config_manager/arch/arm64/Jamfile b/src/add-ons/kernel/bus_managers/config_manager/arch/arm64/Jamfile deleted file mode 100644 index cbe586f742..0000000000 --- a/src/add-ons/kernel/bus_managers/config_manager/arch/arm64/Jamfile +++ /dev/null @@ -1,8 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel bus_managers config_manager arch $(TARGET_ARCH) ; - -SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ; - -UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_ARCH) ] ; - -KernelStaticLibrary config_manager_arch : - ; diff --git a/src/add-ons/kernel/bus_managers/config_manager/arch/m68k/Jamfile b/src/add-ons/kernel/bus_managers/config_manager/arch/m68k/Jamfile deleted file mode 100644 index cc3e99ad72..0000000000 --- a/src/add-ons/kernel/bus_managers/config_manager/arch/m68k/Jamfile +++ /dev/null @@ -1,12 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel bus_managers config_manager arch m68k ; - -SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ; - -UsePrivateHeaders kernel [ FDirName kernel arch m68k ] ; - -KernelStaticLibrary config_manager_arch : - config_manager_arch.c - amiga_hardcoded.c - atari_hardcoded.c - ; - diff --git a/src/add-ons/kernel/bus_managers/config_manager/arch/m68k/amiga_hardcoded.c b/src/add-ons/kernel/bus_managers/config_manager/arch/m68k/amiga_hardcoded.c deleted file mode 100644 index 258153b298..0000000000 --- a/src/add-ons/kernel/bus_managers/config_manager/arch/m68k/amiga_hardcoded.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2007 Haiku, Inc. - * Distributed under the terms of the MIT License. - * - * arch-specific config manager - * - * Authors (in chronological order): - * François Revol (revol@free.fr) - */ - -#include "config_manager_arch.h" - -#if 0 - -#define DIS sizeof(struct device_info) -#define DIF (B_DEVICE_INFO_ENABLED|B_DEVICE_INFO_CONFIGURED) -#define DID 'm', '6', '8', - -static struct hardcoded_device gHardcodedDevices[] = { -/* video */ - {{DIS, DIS, B_ISA_BUS, {PCI_display, PCI_display_other, 0xff}, {DID, 0}, DIF, B_OK }, - .isa = {}}, -/* ide */ - {{DIS, DIS, B_ISA_BUS, {PCI_mass_storage, PCI_ide, 0xff}, {DID, 1}, DIF, B_OK }, - .isa = {}} -/* scsi */ - {{DIS, DIS, B_ISA_BUS, {PCI_mass_storage, PCI_scsi, 0xff}, {DID, 2}, DIF, B_OK }, - .isa = {}} -/* audio */ - {{DIS, DIS, B_ISA_BUS, {PCI_multimedia, 0xff, 0xff}, {DID, 3}, DIF, B_OK }, - .isa = {}} -}; - -#endif - -status_t -amiga_hardcoded(struct device_info **info, int32 *count) -{ - return B_OK; -} - - diff --git a/src/add-ons/kernel/bus_managers/config_manager/arch/m68k/atari_hardcoded.c b/src/add-ons/kernel/bus_managers/config_manager/arch/m68k/atari_hardcoded.c deleted file mode 100644 index 1b21a92dac..0000000000 --- a/src/add-ons/kernel/bus_managers/config_manager/arch/m68k/atari_hardcoded.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2007 Haiku, Inc. - * Distributed under the terms of the MIT License. - * - * arch-specific config manager - * - * Authors (in chronological order): - * François Revol (revol@free.fr) - */ - -#include "config_manager_arch.h" - -#define DIS sizeof(struct device_info) -#define DIF (B_DEVICE_INFO_ENABLED|B_DEVICE_INFO_CONFIGURED) -#define DID 'm68k', 'atar', 'i ' - -static struct hardcoded_device gHardcodedDevices[] = { -/* video */ - {{DIS, DIS, B_ISA_BUS, {PCI_display, PCI_display_other, 0xff}, {DID, 0}, DIF, B_OK }, - { .isa = {} }, - .configs = {}}, -/* ide */ - {{DIS, DIS, B_ISA_BUS, {PCI_mass_storage, PCI_ide, 0xff}, {DID, 1}, DIF, B_OK }, - { .isa = {} }, - .configs = {}}, -/* scsi */ - {{DIS, DIS, B_ISA_BUS, {PCI_mass_storage, PCI_scsi, 0xff}, {DID, 2}, DIF, B_OK }, - { .isa = {} }, - .configs = {}}, -/* audio */ - {{DIS, DIS, B_ISA_BUS, {PCI_multimedia, 0xff, 0xff}, {DID, 3}, DIF, B_OK }, - { .isa = {} }, - .configs = { }}, -}; - -status_t -atari_hardcoded(struct device_info **info, int32 *count) -{ - return B_OK; -} - - diff --git a/src/add-ons/kernel/bus_managers/config_manager/arch/m68k/config_manager_arch.c b/src/add-ons/kernel/bus_managers/config_manager/arch/m68k/config_manager_arch.c deleted file mode 100644 index 77c5988ca3..0000000000 --- a/src/add-ons/kernel/bus_managers/config_manager/arch/m68k/config_manager_arch.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2007 Haiku, Inc. - * Distributed under the terms of the MIT License. - * - * arch-specific config manager - * - * Authors (in chronological order): - * François Revol (revol@free.fr) - */ - -#include -#include - -int config_manager_scan_hardcoded(struct device_info **info, int32 *count) -{ - //XXX - return atari_hardcoded(info, count); - - count = 0; - return B_OK; -} - diff --git a/src/add-ons/kernel/bus_managers/config_manager/arch/m68k/config_manager_arch.h b/src/add-ons/kernel/bus_managers/config_manager/arch/m68k/config_manager_arch.h deleted file mode 100644 index c00eed3429..0000000000 --- a/src/add-ons/kernel/bus_managers/config_manager/arch/m68k/config_manager_arch.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2007 Haiku, Inc. - * Distributed under the terms of the MIT License. - * - * arch-specific config manager - * - * Authors (in chronological order): - * François Revol (revol@free.fr) - */ -#ifndef _CONFIG_MANAGER_ARCH_H -#define _CONFIG_MANAGER_ARCH_H - -#include -#include -#include -#include - -struct hardcoded_device { - struct device_info info; - union { - struct isa_info isa; - pci_info pci; - //pcmcia... - } bus; - struct possible_device_configurations configs; -}; - -#endif /* _CONFIG_MANAGER_ARCH_H */ - diff --git a/src/add-ons/kernel/bus_managers/config_manager/arch/ppc/Jamfile b/src/add-ons/kernel/bus_managers/config_manager/arch/ppc/Jamfile deleted file mode 100644 index 5708a49adf..0000000000 --- a/src/add-ons/kernel/bus_managers/config_manager/arch/ppc/Jamfile +++ /dev/null @@ -1,10 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel bus_managers config_manager arch ppc ; - -SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ; - -UsePrivateHeaders kernel [ FDirName kernel arch ppc ] ; - -KernelStaticLibrary config_manager_arch : - config_manager_arch.c - ; - diff --git a/src/add-ons/kernel/bus_managers/config_manager/arch/ppc/config_manager_arch.c b/src/add-ons/kernel/bus_managers/config_manager/arch/ppc/config_manager_arch.c deleted file mode 100644 index fe48b06817..0000000000 --- a/src/add-ons/kernel/bus_managers/config_manager/arch/ppc/config_manager_arch.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2007 Haiku, Inc. - * Distributed under the terms of the MIT License. - * - * arch-specific config manager - * - * Authors (in chronological order): - * François Revol (revol@free.fr) - */ - -#include -#include - -int config_manager_scan_hardcoded(struct device_info **info, int32 *count) -{ - return B_OK; -} - diff --git a/src/add-ons/kernel/bus_managers/config_manager/arch/riscv64/Jamfile b/src/add-ons/kernel/bus_managers/config_manager/arch/riscv64/Jamfile deleted file mode 100644 index 909a67c5ee..0000000000 --- a/src/add-ons/kernel/bus_managers/config_manager/arch/riscv64/Jamfile +++ /dev/null @@ -1,10 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel bus_managers config_manager arch $(TARGET_ARCH) ; - -SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ; - -UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_ARCH) ] ; - -KernelStaticLibrary config_manager_arch : - config_manager_arch.c - ; - diff --git a/src/add-ons/kernel/bus_managers/config_manager/arch/riscv64/config_manager_arch.c b/src/add-ons/kernel/bus_managers/config_manager/arch/riscv64/config_manager_arch.c deleted file mode 100644 index 1996ba4daf..0000000000 --- a/src/add-ons/kernel/bus_managers/config_manager/arch/riscv64/config_manager_arch.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2009 Haiku, Inc. - * Distributed under the terms of the MIT License. - * - * arch-specific config manager - * - * Authors (in chronological order): - * François Revol (revol@free.fr) - */ - -#include -#include - -int config_manager_scan_hardcoded(struct device_info **info, int32 *count) -{ - return B_OK; -} - diff --git a/src/add-ons/kernel/bus_managers/config_manager/arch/sparc/Jamfile b/src/add-ons/kernel/bus_managers/config_manager/arch/sparc/Jamfile deleted file mode 100644 index f1ee9bbc15..0000000000 --- a/src/add-ons/kernel/bus_managers/config_manager/arch/sparc/Jamfile +++ /dev/null @@ -1,11 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel bus_managers config_manager arch $(TARGET_ARCH) ; - -SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ; - -UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_ARCH) ] ; - -KernelStaticLibrary config_manager_arch : - config_manager_arch.c - ; - - diff --git a/src/add-ons/kernel/bus_managers/config_manager/arch/sparc/config_manager_arch.c b/src/add-ons/kernel/bus_managers/config_manager/arch/sparc/config_manager_arch.c deleted file mode 100644 index 1996ba4daf..0000000000 --- a/src/add-ons/kernel/bus_managers/config_manager/arch/sparc/config_manager_arch.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2009 Haiku, Inc. - * Distributed under the terms of the MIT License. - * - * arch-specific config manager - * - * Authors (in chronological order): - * François Revol (revol@free.fr) - */ - -#include -#include - -int config_manager_scan_hardcoded(struct device_info **info, int32 *count) -{ - return B_OK; -} - diff --git a/src/add-ons/kernel/bus_managers/config_manager/arch/x86/Jamfile b/src/add-ons/kernel/bus_managers/config_manager/arch/x86/Jamfile deleted file mode 100644 index f7a53d8ba1..0000000000 --- a/src/add-ons/kernel/bus_managers/config_manager/arch/x86/Jamfile +++ /dev/null @@ -1,10 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel bus_managers config_manager arch x86 ; - -SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ; - -UsePrivateHeaders kernel [ FDirName kernel arch x86 ] ; - -KernelStaticLibrary config_manager_arch : - config_manager_arch.c - ; - diff --git a/src/add-ons/kernel/bus_managers/config_manager/arch/x86/config_manager_arch.c b/src/add-ons/kernel/bus_managers/config_manager/arch/x86/config_manager_arch.c deleted file mode 100644 index fe48b06817..0000000000 --- a/src/add-ons/kernel/bus_managers/config_manager/arch/x86/config_manager_arch.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2007 Haiku, Inc. - * Distributed under the terms of the MIT License. - * - * arch-specific config manager - * - * Authors (in chronological order): - * François Revol (revol@free.fr) - */ - -#include -#include - -int config_manager_scan_hardcoded(struct device_info **info, int32 *count) -{ - return B_OK; -} - diff --git a/src/add-ons/kernel/bus_managers/config_manager/config_manager.c b/src/add-ons/kernel/bus_managers/config_manager/config_manager.c deleted file mode 100644 index ccb7a66261..0000000000 --- a/src/add-ons/kernel/bus_managers/config_manager/config_manager.c +++ /dev/null @@ -1,173 +0,0 @@ -/* Config Manager - * provides access to device configurations - * - * Copyright 2002-2004, Marcus Overhagen, marcus@overhagen.de. - * Distributed under the terms of the MIT License. - */ - - -#include -#include -#include -#include -#include -#include -#include - - -static pci_module_info *gPCI = NULL; - -#define B_CONFIG_MANAGER_FOR_BUS_MODULE_NAME "bus_managers/config_manager/bus/v1" - -#define FUNCTION(x, y...) dprintf("%s" x, __FUNCTION__, y) -#define TRACE(x) dprintf x - - -// Driver module API - - -static status_t -driver_get_next_device_info(bus_type bus, uint64 *cookie, struct device_info *info, uint32 size) -{ - FUNCTION("(bus = %d, cookie = %" B_PRId64 ")\n", bus, *cookie); - return B_ENTRY_NOT_FOUND; -} - - -static status_t -driver_get_device_info_for(uint64 id, struct device_info *info, uint32 size) -{ - FUNCTION("(id = %" B_PRId64 ")\n", id); - return B_ENTRY_NOT_FOUND; -} - - -static status_t -driver_get_size_of_current_configuration_for(uint64 id) -{ - FUNCTION("(id = %" B_PRId64 ")\n", id); - return B_ENTRY_NOT_FOUND; -} - - -static status_t -driver_get_current_configuration_for(uint64 id, struct device_configuration *current, uint32 size) -{ - FUNCTION("(id = %" B_PRId64 ", current = %p, size = %" B_PRIu32 ")\n", id, - current, size); - return B_ENTRY_NOT_FOUND; -} - - -static status_t -driver_get_size_of_possible_configurations_for(uint64 id) -{ - FUNCTION("(id = %" B_PRId64 ")\n", id); - return B_ENTRY_NOT_FOUND; -} - - -static status_t -driver_get_possible_configurations_for(uint64 id, struct possible_device_configurations *possible, uint32 size) -{ - FUNCTION("(id = %" B_PRId64 ", possible = %p, size = %" B_PRIu32 ")\n", id, - possible, size); - return B_ENTRY_NOT_FOUND; -} - - -static status_t -driver_count_resource_descriptors_of_type(const struct device_configuration *config, resource_type type) -{ - FUNCTION("(config = %p, type = %d)\n", config, type); - return B_ENTRY_NOT_FOUND; -} - - -static status_t -driver_get_nth_resource_descriptor_of_type(const struct device_configuration *config, uint32 num, - resource_type type, resource_descriptor *descr, uint32 size) -{ - FUNCTION("(config = %p, num = %" B_PRId32 ")\n", config, num); - return B_ENTRY_NOT_FOUND; -} - - -static int32 -driver_std_ops(int32 op, ...) -{ - switch (op) { - case B_MODULE_INIT: - TRACE(("config_manager: driver module: init\n")); - - // ToDo: should not do this! Instead, iterate through all busses/config_manager/ - // modules and get them - if (get_module(B_PCI_MODULE_NAME, (module_info **)&gPCI) != 0) { - TRACE(("config_manager: failed to load PCI module\n")); - return -1; - } - break; - case B_MODULE_UNINIT: - TRACE(("config_manager: driver module: uninit\n")); - break; - default: - return EINVAL; - } - return B_OK; -} - - -// #pragma mark - -// Bus module API - - -static int32 -bus_std_ops(int32 op, ...) -{ - switch(op) { - case B_MODULE_INIT: - TRACE(("config_manager: bus module: init\n")); - break; - case B_MODULE_UNINIT: - TRACE(("config_manager: bus module: uninit\n")); - break; - default: - return EINVAL; - } - return B_OK; -} - - -struct config_manager_for_driver_module_info gDriverModuleInfo = { - { - B_CONFIG_MANAGER_FOR_DRIVER_MODULE_NAME, - B_KEEP_LOADED, - driver_std_ops - }, - - &driver_get_next_device_info, - &driver_get_device_info_for, - &driver_get_size_of_current_configuration_for, - &driver_get_current_configuration_for, - &driver_get_size_of_possible_configurations_for, - &driver_get_possible_configurations_for, - - &driver_count_resource_descriptors_of_type, - &driver_get_nth_resource_descriptor_of_type, -}; - -struct module_info gBusModuleInfo = { - //{ - B_CONFIG_MANAGER_FOR_BUS_MODULE_NAME, - B_KEEP_LOADED, - bus_std_ops - //}, - - // ToDo: find out what's in here! -}; - -module_info *modules[] = { - (module_info *)&gDriverModuleInfo, - (module_info *)&gBusModuleInfo, - NULL -}; diff --git a/src/add-ons/kernel/drivers/misc/Jamfile b/src/add-ons/kernel/drivers/misc/Jamfile index 3ed461b473..b6ecbaf1e1 100644 --- a/src/add-ons/kernel/drivers/misc/Jamfile +++ b/src/add-ons/kernel/drivers/misc/Jamfile @@ -11,10 +11,6 @@ KernelAddon poke : poke.cpp ; -KernelAddon config : - config.c - ; - KernelAddon kdl : kdl.c ; diff --git a/src/add-ons/kernel/drivers/misc/config.c b/src/add-ons/kernel/drivers/misc/config.c deleted file mode 100644 index 461cd8f372..0000000000 --- a/src/add-ons/kernel/drivers/misc/config.c +++ /dev/null @@ -1,164 +0,0 @@ -/* config driver - * provides userland access to the device configuration manager - * - * Copyright 2002-2004, Axel Doerfler. All rights reserved. - * Distributed under the terms of the MIT License. - */ - - -#include -#include -#include - -#include "config_driver.h" - - -#define DEVICE_NAME "misc/config" - -int32 api_version = B_CUR_DRIVER_API_VERSION; - -struct config_manager_for_driver_module_info *gConfigManager; - - -// Device interface - - -static status_t -config_open(const char *name, uint32 flags, void **_cookie) -{ - *_cookie = NULL; - return B_OK; -} - - -static status_t -config_close(void *cookie) -{ - return B_OK; -} - - -static status_t -config_free_cookie(void *cookie) -{ - return B_OK; -} - - -static status_t -config_ioctl(void *cookie, uint32 op, void *buffer, size_t len) -{ - struct cm_ioctl_data *params = (struct cm_ioctl_data *)buffer; - - // simple check for validity of the argument - if (params == NULL || params->magic != op) - return B_BAD_VALUE; - - // ToDo: the access of the params is not safe! - - switch (op) { - case CM_GET_NEXT_DEVICE_INFO: - return gConfigManager->get_next_device_info(params->bus, ¶ms->cookie, - (struct device_info *)params->data, params->data_len); - case CM_GET_DEVICE_INFO_FOR: - return gConfigManager->get_device_info_for(params->cookie, - (struct device_info *)params->data, params->data_len); - case CM_GET_SIZE_OF_CURRENT_CONFIGURATION_FOR: - return gConfigManager->get_size_of_current_configuration_for(params->cookie); - case CM_GET_CURRENT_CONFIGURATION_FOR: - return gConfigManager->get_current_configuration_for(params->cookie, - (struct device_configuration *)params->data, params->data_len); - case CM_GET_SIZE_OF_POSSIBLE_CONFIGURATIONS_FOR: - return gConfigManager->get_size_of_possible_configurations_for(params->cookie); - case CM_GET_POSSIBLE_CONFIGURATIONS_FOR: - return gConfigManager->get_possible_configurations_for(params->cookie, - (struct possible_device_configurations *)params->data, params->data_len); - case CM_COUNT_RESOURCE_DESCRIPTORS_OF_TYPE: - return gConfigManager->count_resource_descriptors_of_type(params->config, params->type); - case CM_GET_NTH_RESOURCE_DESCRIPTOR_OF_TYPE: - return gConfigManager->get_nth_resource_descriptor_of_type(params->config, params->n, - params->type, (resource_descriptor *)params->data, params->data_len); - } - - return B_BAD_VALUE; -} - - -static status_t -config_read(void * cookie, off_t pos, void *buf, size_t *_length) -{ - *_length = 0; - return B_OK; -} - - -static status_t -config_write(void * cookie, off_t pos, const void *buf, size_t *_length) -{ - *_length = 0; - return B_OK; -} - - -// #pragma mark - -// Driver interface - - -status_t -init_hardware() -{ - return B_OK; -} - - -const char ** -publish_devices(void) -{ - static const char *devices[] = { - DEVICE_NAME, - NULL - }; - - return devices; -} - - -device_hooks * -find_device(const char *name) -{ - static device_hooks hooks = { - &config_open, - &config_close, - &config_free_cookie, - &config_ioctl, - &config_read, - &config_write, - /* Leave select/deselect/readv/writev undefined. The kernel will - * use its own default implementation. The basic hooks above this - * line MUST be defined, however. */ - NULL, - NULL, - NULL, - NULL - }; - - if (!strcmp(name, DEVICE_NAME)) - return &hooks; - - return NULL; -} - - -status_t -init_driver() -{ - return get_module(B_CONFIG_MANAGER_FOR_DRIVER_MODULE_NAME, (module_info **)&gConfigManager); -} - - -void -uninit_driver() -{ - put_module(B_CONFIG_MANAGER_FOR_DRIVER_MODULE_NAME); -} - diff --git a/src/add-ons/kernel/drivers/misc/config_driver.h b/src/add-ons/kernel/drivers/misc/config_driver.h deleted file mode 100644 index be544750fd..0000000000 --- a/src/add-ons/kernel/drivers/misc/config_driver.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef _CONFIG_MANAGER_DRIVER_H_ -#define _CONFIG_MANAGER_DRIVER_H_ -/* -** Distributed under the terms of the MIT License. -*/ - -/* definitions for the /dev/misc/config driver which provides access - * to the config_manager via calls to ioctl(). - * - * ToDo: This file should probably located in a publicly accessable place?! - */ - -/* the magic is the ioctl */ - -#define CM_GET_NEXT_DEVICE_INFO 'GNDI' -#define CM_GET_DEVICE_INFO_FOR 'GDIF' -#define CM_GET_SIZE_OF_CURRENT_CONFIGURATION_FOR 'GSCC' -#define CM_GET_CURRENT_CONFIGURATION_FOR 'GCCF' -#define CM_GET_SIZE_OF_POSSIBLE_CONFIGURATIONS_FOR 'GSPC' -#define CM_GET_POSSIBLE_CONFIGURATIONS_FOR 'GPCF' - -#define CM_COUNT_RESOURCE_DESCRIPTORS_OF_TYPE 'CRDT' -#define CM_GET_NTH_RESOURCE_DESCRIPTOR_OF_TYPE 'GNRD' - -struct cm_ioctl_data { - uint32 magic; - bus_type bus; - uint64 cookie; - void *config; - uint32 n; - uint32 type; - void *data; - uint32 data_len; -}; - -#define CM_DEVICE_NAME "misc/config" - -#endif /* _CONFIG_MANAGER_DRIVER_H_ */