From b33289a29dedcd0f7e6a5c888ae60768efd37169 Mon Sep 17 00:00:00 2001 From: neil Date: Sat, 8 Nov 2014 20:56:36 +0000 Subject: [PATCH] ACPICABase must be a global variable if acpica.library is to be optional. Otherwise, it will be overridden by the autoinit system, which will make the library mandatory. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@49775 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- arch/all-pc/hidds/pcipc/driverclass.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/all-pc/hidds/pcipc/driverclass.c b/arch/all-pc/hidds/pcipc/driverclass.c index 14c99b0048..e4942873cf 100644 --- a/arch/all-pc/hidds/pcipc/driverclass.c +++ b/arch/all-pc/hidds/pcipc/driverclass.c @@ -1,5 +1,5 @@ /* - Copyright © 2004-2011, The AROS Development Team. All rights reserved. + Copyright © 2004-2014, The AROS Development Team. All rights reserved. $Id$ Desc: PCI direct driver for i386 native. @@ -7,7 +7,7 @@ */ #define __OOP_NOATTRBASES__ -//#define DEBUG 1 + #include #include #include @@ -29,6 +29,9 @@ #define HiddAttrBase (PSD(cl)->hiddAB) #define HiddPCIDeviceAttrBase (PSD(cl)->hidd_PCIDeviceAB) +/* ACPICABase is optional */ +struct Library *ACPICABase; + /* We overload the New method in order to introduce the Hidd Name and HardwareName attributes. @@ -135,7 +138,7 @@ ULONG PCPCI__Hidd_PCIDriver__ReadConfigLong(OOP_Class *cl, OOP_Object *o, /* Last good long register without ECAM, - macros in CAM methods take care of the alignement. + macros in CAM methods take care of the alignment. we don't want to return some random value. */ if(msg->reg < 0x100) { @@ -176,7 +179,7 @@ void PCPCI__Hidd_PCIDriver__WriteConfigLong(OOP_Class *cl, OOP_Object *o, } else { /* Last good long register without ECAM, - macros in CAM methods take care of the alignement. + macros in CAM methods take care of the alignment. we don't want to store the value in some random address. */ if(msg->reg < 0x100) { @@ -195,8 +198,6 @@ static int PCPCI_InitClass(LIBBASETYPEPTR LIBBASE) struct pHidd_PCI_AddHardwareDriver msg,*pmsg=&msg; - struct Library *ACPICABase; - /* We only (try to) fetch the mcfg_table, no need to keep ACPI library open. */ -- 2.11.4.GIT