ACPI with CONFIG_PCI turned off

ACPI with CONFIG_PCI turned off

[Jesse Barnes]

I recently tried compiling ACPI w/o CONFIG_PCI turned on for debugging
purposes and only ran into a few small problems.  Here's a patch
against 2.5.60-ia64 that works for me, but I'm not sure if it's
entirely correct as this is my first time messing with the code.

Thanks,
Jesse


diff -Naur -X /usr/people/jbarnes/dontdiff linux-2.5.60-ia64-sn/arch/ia64/kernel/acpi.c work-sn2/arch/ia64/kernel/acpi.c
--- linux-2.5.60-ia64-sn/arch/ia64/kernel/acpi.c	Mon Feb 24 12:27:12 2003
+++ work-sn2/arch/ia64/kernel/acpi.c	Sat Mar  1 12:38:05 2003
@@ -825,6 +825,7 @@
 /* --------------------------------------------------------------------------
                              PCI Interrupt Routing
    -------------------------------------------------------------------------- */
+#ifdef CONFIG_PCI
 
 int __init
 acpi_get_prt (struct pci_vector_struct **vectors, int *count)
@@ -866,7 +867,7 @@
 	*count = acpi_prt.count;
 	return 0;
 }
-
+#endif
 /* Assume IA64 always use I/O SAPIC */
 
 int __init
diff -Naur -X /usr/people/jbarnes/dontdiff linux-2.5.60-ia64-sn/drivers/acpi/osl.c work-sn2/drivers/acpi/osl.c
--- linux-2.5.60-ia64-sn/drivers/acpi/osl.c	Mon Feb 24 12:27:12 2003
+++ work-sn2/drivers/acpi/osl.c	Sat Mar  1 13:12:41 2003
@@ -534,7 +534,7 @@
 
 acpi_status
 acpi_os_write_pci_configuration (
-	acpi_pci_id             *pci_id,
+	struct acpi_pci_id      *pci_id,
 	u32                     reg,
 	acpi_integer            value,
 	u32                     width)
@@ -544,13 +544,22 @@
 
 acpi_status
 acpi_os_read_pci_configuration (
-	acpi_pci_id             *pci_id,
+	struct acpi_pci_id      *pci_id,
 	u32                     reg,
 	void                    *value,
 	u32                     width)
 {
 	return (AE_SUPPORT);
 }
+
+void
+acpi_os_derive_pci_id (
+	acpi_handle		rhandle,        /* upper bound  */
+	acpi_handle		chandle,        /* current node */
+	struct acpi_pci_id	**id)
+{
+	return (AE_SUPPORT);
+}
 
 #endif /*CONFIG_ACPI_PCI*/
 


-------------------------------------------------------
This SF.net email is sponsored by: Etnus, makers of TotalView, The debugger 
for complex code. Debugging C/C++ programs can leave you feeling lost and 
disoriented. TotalView can help you find your way. Available on major UNIX 
and Linux platforms. Try it free. www.etnus.com

RE: ACPI with CONFIG_PCI turned off

[Grover, Andrew]

Part of this is a patch Pavel posted earlier that I completely dropped.
Sorry Pavel, my fault.

w.r.t. the ia64 specific part, it looks fine but please channel through
the linux-ia64 list and maintainer.

Regards -- Andy

> From: Jesse Barnes [mailto:jbarnes-sJ/iWh9BUns@public.gmane.org] 
> Sent: Wednesday, March 05, 2003 4:01 PM
> To: acpi-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
> Subject: [ACPI] ACPI with CONFIG_PCI turned off
> 
> 
> I recently tried compiling ACPI w/o CONFIG_PCI turned on for debugging
> purposes and only ran into a few small problems.  Here's a patch
> against 2.5.60-ia64 that works for me, but I'm not sure if it's
> entirely correct as this is my first time messing with the code.
> 
> Thanks,
> Jesse
> 
> 
> diff -Naur -X /usr/people/jbarnes/dontdiff 
> linux-2.5.60-ia64-sn/arch/ia64/kernel/acpi.c 
> work-sn2/arch/ia64/kernel/acpi.c
> --- linux-2.5.60-ia64-sn/arch/ia64/kernel/acpi.c	Mon Feb 
> 24 12:27:12 2003
> +++ work-sn2/arch/ia64/kernel/acpi.c	Sat Mar  1 12:38:05 2003
> @@ -825,6 +825,7 @@
>  /* 
> --------------------------------------------------------------
> ------------
>                               PCI Interrupt Routing
>     
> --------------------------------------------------------------
> ------------ */
> +#ifdef CONFIG_PCI
>  
>  int __init
>  acpi_get_prt (struct pci_vector_struct **vectors, int *count)
> @@ -866,7 +867,7 @@
>  	*count = acpi_prt.count;
>  	return 0;
>  }
> -
> +#endif
>  /* Assume IA64 always use I/O SAPIC */
>  
>  int __init
> diff -Naur -X /usr/people/jbarnes/dontdiff 
> linux-2.5.60-ia64-sn/drivers/acpi/osl.c work-sn2/drivers/acpi/osl.c
> --- linux-2.5.60-ia64-sn/drivers/acpi/osl.c	Mon Feb 24 12:27:12 2003
> +++ work-sn2/drivers/acpi/osl.c	Sat Mar  1 13:12:41 2003
> @@ -534,7 +534,7 @@
>  
>  acpi_status
>  acpi_os_write_pci_configuration (
> -	acpi_pci_id             *pci_id,
> +	struct acpi_pci_id      *pci_id,
>  	u32                     reg,
>  	acpi_integer            value,
>  	u32                     width)
> @@ -544,13 +544,22 @@
>  
>  acpi_status
>  acpi_os_read_pci_configuration (
> -	acpi_pci_id             *pci_id,
> +	struct acpi_pci_id      *pci_id,
>  	u32                     reg,
>  	void                    *value,
>  	u32                     width)
>  {
>  	return (AE_SUPPORT);
>  }
> +
> +void
> +acpi_os_derive_pci_id (
> +	acpi_handle		rhandle,        /* upper bound  */
> +	acpi_handle		chandle,        /* current node */
> +	struct acpi_pci_id	**id)
> +{
> +	return (AE_SUPPORT);
> +}
>  
>  #endif /*CONFIG_ACPI_PCI*/
>  
> 
> 
> -------------------------------------------------------
> This SF.net email is sponsored by: Etnus, makers of 
> TotalView, The debugger 
> for complex code. Debugging C/C++ programs can leave you 
> feeling lost and 
> disoriented. TotalView can help you find your way. Available 
> on major UNIX 
> and Linux platforms. Try it free. www.etnus.com
> _______________________________________________
> Acpi-devel mailing list
> Acpi-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
> https://lists.sourceforge.net/lists/listinfo/acpi-devel
> 


-------------------------------------------------------
This SF.net email is sponsored by: Etnus, makers of TotalView, The debugger 
for complex code. Debugging C/C++ programs can leave you feeling lost and 
disoriented. TotalView can help you find your way. Available on major UNIX 
and Linux platforms. Try it free. www.etnus.com