Skip to content

Commit

Permalink
[POWERPC] ps3: get av_multi_out params
Browse files Browse the repository at this point in the history
Allow the PS3 AV settings driver to access the default video mode stored in
the OS area.

Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Geert Uytterhoeven authored and Paul Mackerras committed Feb 7, 2007
1 parent 66b4495 commit 098e274
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 7 deletions.
17 changes: 10 additions & 7 deletions arch/powerpc/platforms/ps3/os-area.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,6 @@ enum {
PARAM_BOOT_FLAG_OTHER_OS = 1,
};

enum {
PARAM_AV_MULTI_OUT_NTSC = 0,
PARAM_AV_MULTI_OUT_PAL_RGB = 1,
PARAM_AV_MULTI_OUT_PAL_YCBCR = 2,
PARAM_AV_MULTI_OUT_SECAM = 3,
};

enum {
PARAM_CTRL_BUTTON_O_IS_YES = 0,
PARAM_CTRL_BUTTON_X_IS_YES = 1,
Expand Down Expand Up @@ -257,3 +250,13 @@ u64 ps3_os_area_rtc_diff(void)
{
return saved_params.rtc_diff ? saved_params.rtc_diff : 946684800UL;
}

/**
* ps3_os_area_get_av_multi_out - Returns the default video mode.
*/

enum ps3_param_av_multi_out ps3_os_area_get_av_multi_out(void)
{
return saved_params.av_multi_out;
}
EXPORT_SYMBOL_GPL(ps3_os_area_get_av_multi_out);
11 changes: 11 additions & 0 deletions include/asm-powerpc/ps3.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,17 @@ union ps3_firmware_version {

int ps3_get_firmware_version(union ps3_firmware_version *v);

/* 'Other OS' area */

enum ps3_param_av_multi_out {
PS3_PARAM_AV_MULTI_OUT_NTSC = 0,
PS3_PARAM_AV_MULTI_OUT_PAL_RGB = 1,
PS3_PARAM_AV_MULTI_OUT_PAL_YCBCR = 2,
PS3_PARAM_AV_MULTI_OUT_SECAM = 3,
};

enum ps3_param_av_multi_out ps3_os_area_get_av_multi_out(void);

/**
* struct ps3_device_id - HV bus device identifier from the system repository
* @bus_id: HV bus id, {1..} (zero invalid)
Expand Down

0 comments on commit 098e274

Please sign in to comment.