Style and whitespace changes. Also, make the ivar functions non-inline

since inlining failed due to the size of BUS_*

1 files changed, 61 insertions, 136 deletions

diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
index 42ab459..e79fa97 100644
--- a/sys/dev/acpica/acpivar.h
+++ b/sys/dev/acpica/acpivar.h
@@ -142,81 +142,13 @@ struct acpi_device {
 #define ACPI_IVAR_MAGIC		0x101
 #define ACPI_IVAR_PRIVATE	0x102
 
-static __inline ACPI_HANDLE
-acpi_get_handle(device_t dev)
-{
-    uintptr_t up;
-    ACPI_HANDLE	h;
-
-    if (BUS_READ_IVAR(device_get_parent(dev), dev, ACPI_IVAR_HANDLE, &up))
-	return(NULL);
-    h = (ACPI_HANDLE)up;
-    return(h);
-}
-	    
-static __inline int
-acpi_set_handle(device_t dev, ACPI_HANDLE h)
-{
-    uintptr_t up;
-
-    up = (uintptr_t)h;
-    return(BUS_WRITE_IVAR(device_get_parent(dev), dev, ACPI_IVAR_HANDLE, up));
-}
-	    
-static __inline int
-acpi_get_magic(device_t dev)
-{
-    uintptr_t up;
-    int	m;
-
-    if (BUS_READ_IVAR(device_get_parent(dev), dev, ACPI_IVAR_MAGIC, &up))
-	return(0);
-    m = (int)up;
-    return(m);
-}
-
-static __inline int
-acpi_set_magic(device_t dev, int m)
-{
-    uintptr_t up;
-
-    up = (uintptr_t)m;
-    return(BUS_WRITE_IVAR(device_get_parent(dev), dev, ACPI_IVAR_MAGIC, up));
-}
-
-static __inline void *
-acpi_get_private(device_t dev)
-{
-    uintptr_t up;
-    void *p;
-
-    if (BUS_READ_IVAR(device_get_parent(dev), dev, ACPI_IVAR_PRIVATE, &up))
-	return(NULL);
-    p = (void *)up;
-    return(p);
-}
-
-static __inline int
-acpi_set_private(device_t dev, void *p)
-{
-    uintptr_t up;
-
-    up = (uintptr_t)p;
-    return(BUS_WRITE_IVAR(device_get_parent(dev), dev, ACPI_IVAR_PRIVATE, up));
-}
-
-static __inline ACPI_OBJECT_TYPE
-acpi_get_type(device_t dev)
-{
-    ACPI_HANDLE		h;
-    ACPI_OBJECT_TYPE	t;
-
-    if ((h = acpi_get_handle(dev)) == NULL)
-	return(ACPI_TYPE_NOT_FOUND);
-    if (AcpiGetType(h, &t) != AE_OK)
-	return(ACPI_TYPE_NOT_FOUND);
-    return(t);
-}
+extern ACPI_HANDLE	acpi_get_handle(device_t dev);
+extern int		acpi_set_handle(device_t dev, ACPI_HANDLE h);
+extern int		acpi_get_magic(device_t dev);
+extern int		acpi_set_magic(device_t dev, int m);
+extern void *		acpi_get_private(device_t dev);
+extern int		acpi_set_private(device_t dev, void *p);
+extern ACPI_OBJECT_TYPE	acpi_get_type(device_t dev);
 
 #ifdef ACPI_DEBUGGER
 extern void		acpi_EnterDebugger(void);
@@ -229,58 +161,67 @@ extern void		acpi_EnterDebugger(void);
 #define STEP(x)
 #endif
 
-#define ACPI_VPRINT(dev, acpi_sc, x...) do {				\
-	if (acpi_get_verbose(acpi_sc))					\
-		device_printf(dev, x);					\
+#define ACPI_VPRINT(dev, acpi_sc, x...) do {			\
+    if (acpi_get_verbose(acpi_sc))				\
+	device_printf(dev, x);					\
 } while (0)
 
 #define ACPI_DEVINFO_PRESENT(x)	(((x) & 0x9) == 9)
 extern BOOLEAN		acpi_DeviceIsPresent(device_t dev);
 extern BOOLEAN		acpi_BatteryIsPresent(device_t dev);
 extern BOOLEAN		acpi_MatchHid(device_t dev, char *hid);
-extern ACPI_STATUS	acpi_GetHandleInScope(ACPI_HANDLE parent, char *path, ACPI_HANDLE *result);
+extern ACPI_STATUS	acpi_GetHandleInScope(ACPI_HANDLE parent, char *path,
+					      ACPI_HANDLE *result);
 extern ACPI_BUFFER	*acpi_AllocBuffer(int size);
-extern ACPI_STATUS	acpi_EvaluateInteger(ACPI_HANDLE handle, char *path, int *number);
-extern ACPI_STATUS	acpi_ConvertBufferToInteger(ACPI_BUFFER *bufp, int *number);
+extern ACPI_STATUS	acpi_EvaluateInteger(ACPI_HANDLE handle, char *path,
+					     int *number);
+extern ACPI_STATUS	acpi_ConvertBufferToInteger(ACPI_BUFFER *bufp,
+						    int *number);
 extern ACPI_STATUS	acpi_ForeachPackageObject(ACPI_OBJECT *obj, 
-						  void (* func)(ACPI_OBJECT *comp, void *arg),
-						  void *arg);
-extern ACPI_STATUS	acpi_FindIndexedResource(ACPI_BUFFER *buf, int index, ACPI_RESOURCE **resp);
-extern ACPI_STATUS	acpi_AppendBufferResource(ACPI_BUFFER *buf, ACPI_RESOURCE *res);
+				void (*func)(ACPI_OBJECT *comp, void *arg),
+				void *arg);
+extern ACPI_STATUS	acpi_FindIndexedResource(ACPI_BUFFER *buf, int index,
+						 ACPI_RESOURCE **resp);
+extern ACPI_STATUS	acpi_AppendBufferResource(ACPI_BUFFER *buf,
+						  ACPI_RESOURCE *res);
 extern ACPI_STATUS	acpi_SetIntrModel(int model);
-
 extern ACPI_STATUS	acpi_SetSleepState(struct acpi_softc *sc, int state);
 extern ACPI_STATUS	acpi_Enable(struct acpi_softc *sc);
 extern ACPI_STATUS	acpi_Disable(struct acpi_softc *sc);
 
 struct acpi_parse_resource_set {
-    void	(* set_init)(device_t dev, void **context);
-    void	(* set_done)(device_t dev, void *context);
-    void	(* set_ioport)(device_t dev, void *context, u_int32_t base, u_int32_t length);
-    void	(* set_iorange)(device_t dev, void *context, u_int32_t low, u_int32_t high, 
-				u_int32_t length, u_int32_t align);
-    void	(* set_memory)(device_t dev, void *context, u_int32_t base, u_int32_t length);
-    void	(* set_memoryrange)(device_t dev, void *context, u_int32_t low, u_int32_t high, 
-				    u_int32_t length, u_int32_t align);
-    void	(* set_irq)(device_t dev, void *context, u_int32_t *irq, int cout);
-    void	(* set_drq)(device_t dev, void *context, u_int32_t *drq, int count);
-    void	(* set_start_dependant)(device_t dev, void *context, int preference);
-    void	(* set_end_dependant)(device_t dev, void *context);
+    void	(*set_init)(device_t dev, void **context);
+    void	(*set_done)(device_t dev, void *context);
+    void	(*set_ioport)(device_t dev, void *context, u_int32_t base,
+			      u_int32_t length);
+    void	(*set_iorange)(device_t dev, void *context,
+			       u_int32_t low, u_int32_t high, 
+			       u_int32_t length, u_int32_t align);
+    void	(*set_memory)(device_t dev, void *context, u_int32_t base,
+			      u_int32_t length);
+    void	(*set_memoryrange)(device_t dev, void *context, u_int32_t low,
+				   u_int32_t high, u_int32_t length,
+				   u_int32_t align);
+    void	(*set_irq)(device_t dev, void *context, u_int32_t *irq,
+			   int cout);
+    void	(*set_drq)(device_t dev, void *context, u_int32_t *drq,
+			   int count);
+    void	(*set_start_dependant)(device_t dev, void *context,
+				       int preference);
+    void	(*set_end_dependant)(device_t dev, void *context);
 };
 
 extern struct acpi_parse_resource_set	acpi_res_parse_set;
 extern ACPI_STATUS	acpi_parse_resources(device_t dev, ACPI_HANDLE handle,
-					     struct acpi_parse_resource_set *set);
+			    struct acpi_parse_resource_set *set);
 /* XXX until Intel fix this in their headers, based on NEXT_RESOURCE */
-#define ACPI_RESOURCE_NEXT(Res)      (ACPI_RESOURCE *)((UINT8 *) Res + Res->Length)
+#define ACPI_RESOURCE_NEXT(Res) (ACPI_RESOURCE *)((UINT8 *)Res + Res->Length)
 
-/* 
- * ACPI event handling
- */
-extern UINT32		acpi_eventhandler_power_button_for_sleep(void *context);
-extern UINT32		acpi_eventhandler_power_button_for_wakeup(void *context);
-extern UINT32		acpi_eventhandler_sleep_button_for_sleep(void *context);
-extern UINT32		acpi_eventhandler_sleep_button_for_wakeup(void *context);
+/* ACPI event handling */
+extern UINT32	acpi_eventhandler_power_button_for_sleep(void *context);
+extern UINT32	acpi_eventhandler_power_button_for_wakeup(void *context);
+extern UINT32	acpi_eventhandler_sleep_button_for_sleep(void *context);
+extern UINT32	acpi_eventhandler_sleep_button_for_wakeup(void *context);
 
 #define ACPI_EVENT_PRI_FIRST      0
 #define ACPI_EVENT_PRI_DEFAULT    10000
@@ -291,48 +232,40 @@ typedef void (*acpi_event_handler_t)(void *, int);
 EVENTHANDLER_DECLARE(acpi_sleep_event, acpi_event_handler_t);
 EVENTHANDLER_DECLARE(acpi_wakeup_event, acpi_event_handler_t);
 
-/*
- * Device power control.
- */
-extern ACPI_STATUS	acpi_pwr_switch_consumer(ACPI_HANDLE consumer, int state);
+/* Device power control. */
+extern ACPI_STATUS	acpi_pwr_switch_consumer(ACPI_HANDLE consumer,
+						 int state);
 
-/* 
- * Misc. 
- */
+/* Misc. */
 static __inline struct acpi_softc *
 acpi_device_get_parent_softc(device_t child)
 {
     device_t	parent;
 
     parent = device_get_parent(child);
-    if (parent == NULL) {
-	return(NULL);
-    }
-    return(device_get_softc(parent));
+    if (parent == NULL)
+	return (NULL);
+    return (device_get_softc(parent));
 }
 
 static __inline int
 acpi_get_verbose(struct acpi_softc *sc)
 {
     if (sc)
-	return(sc->acpi_verbose);
-    return(0);
+	return (sc->acpi_verbose);
+    return (0);
 }
 
 extern char	*acpi_name(ACPI_HANDLE handle);
 extern int	acpi_avoid(ACPI_HANDLE handle);
 extern int	acpi_disabled(char *subsys);
-
 extern void	acpi_device_enable_wake_capability(ACPI_HANDLE h, int enable);
 extern void	acpi_device_enable_wake_event(ACPI_HANDLE h);
-
 extern int	acpi_machdep_init(device_t dev);
 extern void	acpi_install_wakeup_handler(struct acpi_softc *sc);
 extern int	acpi_sleep_machdep(struct acpi_softc *sc, int state);
 
-/*
- * Battery Abstraction.
- */
+/* Battery Abstraction. */
 struct acpi_battinfo;
 struct acpi_battdesc;
 
@@ -344,15 +277,10 @@ extern int	acpi_battery_get_battdesc(int, struct acpi_battdesc *);
 
 extern int	acpi_cmbat_get_battinfo(int, struct acpi_battinfo *);
 
-/*
- * Embedded controller.
- */
+/* Embedded controller. */
 extern void	acpi_ec_ecdt_probe(device_t);
 
-/*
- * AC adapter interface.
- */
-
+/* AC adapter interface. */
 extern int	acpi_acad_get_acline(int *);
 
 #if __FreeBSD_version >= 500000
@@ -365,9 +293,6 @@ extern int	acpi_acad_get_acline(int *);
 #endif
 
 #ifdef ACPI_USE_THREADS
-/*
- * ACPI task kernel thread initialization.
- */
+/* ACPI task kernel thread initialization. */
 extern int	acpi_task_thread_init(void);
 #endif
-