Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 46838
b: refs/heads/master
c: 098e274
h: refs/heads/master
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Paul Mackerras committed Feb 7, 2007
1 parent d4c0693 commit b8175a0
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 66b44954f8f2129a39d145991c8e635046a71be6
refs/heads/master: 098e27442713ef7921533130ebba5db6ef64aba6
17 changes: 10 additions & 7 deletions trunk/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 trunk/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 b8175a0

Please sign in to comment.