Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / include / asm-powerpc / ps3.h

diff --git a/include/asm-powerpc/ps3.h b/include/asm-powerpc/ps3.h
index 4f753907bbf9704b3fd6a811615748447f9dd610..f577a16c6728a1a34c363ccfefbc526e5c5f4894 100644 (file)
--- a/include/asm-powerpc/ps3.h
+++ b/include/asm-powerpc/ps3.h
@@ -229,6 +229,9 @@ enum lv1_result {
        LV1_INVALID_CLASS_ID            = -21,
        LV1_CONSTRAINT_NOT_SATISFIED    = -22,
        LV1_ALIGNMENT_ERROR             = -23,
+       LV1_HARDWARE_ERROR              = -24,
+       LV1_INVALID_DATA_FORMAT         = -25,
+       LV1_INVALID_OPERATION           = -26,
        LV1_INTERNAL_ERROR              = -32768,
 };
 
@@ -284,6 +287,12 @@ static inline const char* ps3_result(int result)
                return "LV1_CONSTRAINT_NOT_SATISFIED (-22)";
        case LV1_ALIGNMENT_ERROR:
                return "LV1_ALIGNMENT_ERROR (-23)";
+       case LV1_HARDWARE_ERROR:
+               return "LV1_HARDWARE_ERROR (-24)";
+       case LV1_INVALID_DATA_FORMAT:
+               return "LV1_INVALID_DATA_FORMAT (-25)";
+       case LV1_INVALID_OPERATION:
+               return "LV1_INVALID_OPERATION (-26)";
        case LV1_INTERNAL_ERROR:
                return "LV1_INTERNAL_ERROR (-32768)";
        default:
@@ -407,32 +416,17 @@ static inline void *ps3_system_bus_get_driver_data(
 
 extern struct bus_type ps3_system_bus_type;
 
-/* vuart routines */
-
-struct ps3_vuart_port_priv;
-
-/**
- * struct ps3_vuart_port_device - a device on a vuart port
- */
-
-struct ps3_vuart_port_device {
-       enum ps3_match_id match_id;
-       struct device core;
-       struct ps3_vuart_port_priv* priv; /* private driver variables */
+/* system manager */
 
+struct ps3_sys_manager_ops {
+       struct ps3_system_bus_device *dev;
+       void (*power_off)(struct ps3_system_bus_device *dev);
+       void (*restart)(struct ps3_system_bus_device *dev);
 };
 
-int ps3_vuart_port_device_register(struct ps3_vuart_port_device *dev);
-
-/* system manager */
-
-#ifdef CONFIG_PS3_SYS_MANAGER
-void ps3_sys_manager_restart(void);
+void ps3_sys_manager_register_ops(const struct ps3_sys_manager_ops *ops);
 void ps3_sys_manager_power_off(void);
-#else
-static inline void ps3_sys_manager_restart(void) {}
-static inline void ps3_sys_manager_power_off(void) {}
-#endif
+void ps3_sys_manager_restart(void);
 
 struct ps3_prealloc {
     const char *name;
@@ -442,5 +436,7 @@ struct ps3_prealloc {
 };
 
 extern struct ps3_prealloc ps3fb_videomemory;
+extern struct ps3_prealloc ps3flash_bounce_buffer;
+
 
 #endif