diff options
-rw-r--r-- | arch/powerpc/platforms/ps3/os-area.c | 17 | ||||
-rw-r--r-- | include/asm-powerpc/ps3.h | 11 |
2 files changed, 21 insertions, 7 deletions
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c index b4ac924ada43..6d0d2ac39bd8 100644 --- a/arch/powerpc/platforms/ps3/os-area.c +++ b/arch/powerpc/platforms/ps3/os-area.c | |||
@@ -67,13 +67,6 @@ enum { | |||
67 | }; | 67 | }; |
68 | 68 | ||
69 | enum { | 69 | enum { |
70 | PARAM_AV_MULTI_OUT_NTSC = 0, | ||
71 | PARAM_AV_MULTI_OUT_PAL_RGB = 1, | ||
72 | PARAM_AV_MULTI_OUT_PAL_YCBCR = 2, | ||
73 | PARAM_AV_MULTI_OUT_SECAM = 3, | ||
74 | }; | ||
75 | |||
76 | enum { | ||
77 | PARAM_CTRL_BUTTON_O_IS_YES = 0, | 70 | PARAM_CTRL_BUTTON_O_IS_YES = 0, |
78 | PARAM_CTRL_BUTTON_X_IS_YES = 1, | 71 | PARAM_CTRL_BUTTON_X_IS_YES = 1, |
79 | }; | 72 | }; |
@@ -257,3 +250,13 @@ u64 ps3_os_area_rtc_diff(void) | |||
257 | { | 250 | { |
258 | return saved_params.rtc_diff ? saved_params.rtc_diff : 946684800UL; | 251 | return saved_params.rtc_diff ? saved_params.rtc_diff : 946684800UL; |
259 | } | 252 | } |
253 | |||
254 | /** | ||
255 | * ps3_os_area_get_av_multi_out - Returns the default video mode. | ||
256 | */ | ||
257 | |||
258 | enum ps3_param_av_multi_out ps3_os_area_get_av_multi_out(void) | ||
259 | { | ||
260 | return saved_params.av_multi_out; | ||
261 | } | ||
262 | EXPORT_SYMBOL_GPL(ps3_os_area_get_av_multi_out); | ||
diff --git a/include/asm-powerpc/ps3.h b/include/asm-powerpc/ps3.h index d1ae87df7776..f4347c195bfb 100644 --- a/include/asm-powerpc/ps3.h +++ b/include/asm-powerpc/ps3.h | |||
@@ -39,6 +39,17 @@ union ps3_firmware_version { | |||
39 | 39 | ||
40 | int ps3_get_firmware_version(union ps3_firmware_version *v); | 40 | int ps3_get_firmware_version(union ps3_firmware_version *v); |
41 | 41 | ||
42 | /* 'Other OS' area */ | ||
43 | |||
44 | enum ps3_param_av_multi_out { | ||
45 | PS3_PARAM_AV_MULTI_OUT_NTSC = 0, | ||
46 | PS3_PARAM_AV_MULTI_OUT_PAL_RGB = 1, | ||
47 | PS3_PARAM_AV_MULTI_OUT_PAL_YCBCR = 2, | ||
48 | PS3_PARAM_AV_MULTI_OUT_SECAM = 3, | ||
49 | }; | ||
50 | |||
51 | enum ps3_param_av_multi_out ps3_os_area_get_av_multi_out(void); | ||
52 | |||
42 | /** | 53 | /** |
43 | * struct ps3_device_id - HV bus device identifier from the system repository | 54 | * struct ps3_device_id - HV bus device identifier from the system repository |
44 | * @bus_id: HV bus id, {1..} (zero invalid) | 55 | * @bus_id: HV bus id, {1..} (zero invalid) |