diff options
author | Geoff Levand <geoffrey.levand@am.sony.com> | 2007-06-15 18:05:01 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-06-28 05:16:42 -0400 |
commit | 13a5e30cf7407415387b5592b15ef4b352d28283 (patch) | |
tree | 8db7937b82960d0f59f3bbdf4715b347fc7a04d1 /include | |
parent | 66c63b84b23d39ce191a18833b5a769370114ec9 (diff) |
[POWERPC] PS3: Rework AV settings driver
Make the PS3 ps3av driver a loadable module.
- Replace static data with kmalloc()'ed.
o Allocate struct ps3av dynamically, as it contains data used as vuart
receive/transmit buffers
o Move static recv_buf from ps3av_do_pkt() to struct ps3av
- Move ps3av_vuart_{read,write}() from drivers/ps3/ps3av_cmd.c to
drivers/ps3/ps3av.c and make them static as they're used in that file only.
- Make device a PS3 system-bus device.
- Update copyright formatting.
- Make two new routines ps3av_register_flip_ctl() and ps3av_flip_ctl() to
support late binding of the frame buffer flip control routine.
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-powerpc/ps3av.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/include/asm-powerpc/ps3av.h b/include/asm-powerpc/ps3av.h index 7f5948efca9b..7df4250802de 100644 --- a/include/asm-powerpc/ps3av.h +++ b/include/asm-powerpc/ps3av.h | |||
@@ -1,20 +1,23 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2006 Sony Computer Entertainment Inc. | 2 | * PS3 AV backend support. |
3 | * Copyright 2006, 2007 Sony Corporation | ||
4 | * | 3 | * |
5 | * This program is free software; you can redistribute it and/or modify it | 4 | * Copyright (C) 2007 Sony Computer Entertainment Inc. |
6 | * under the terms of the GNU General Public License as published | 5 | * Copyright 2007 Sony Corp. |
7 | * by the Free Software Foundation; version 2 of the License. | ||
8 | * | 6 | * |
9 | * This program is distributed in the hope that it will be useful, but | 7 | * This program is free software; you can redistribute it and/or modify |
10 | * WITHOUT ANY WARRANTY; without even the implied warranty of | 8 | * it under the terms of the GNU General Public License as published by |
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 9 | * the Free Software Foundation; version 2 of the License. |
12 | * General Public License for more details. | ||
13 | * | 10 | * |
14 | * You should have received a copy of the GNU General Public License along | 11 | * This program is distributed in the hope that it will be useful, |
15 | * with this program; if not, write to the Free Software Foundation, Inc., | 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
16 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
17 | */ | 19 | */ |
20 | |||
18 | #ifndef _ASM_POWERPC_PS3AV_H_ | 21 | #ifndef _ASM_POWERPC_PS3AV_H_ |
19 | #define _ASM_POWERPC_PS3AV_H_ | 22 | #define _ASM_POWERPC_PS3AV_H_ |
20 | 23 | ||
@@ -704,12 +707,6 @@ static inline void ps3av_cmd_av_monitor_info_dump(const struct ps3av_pkt_av_get_ | |||
704 | extern int ps3av_cmd_video_get_monitor_info(struct ps3av_pkt_av_get_monitor_info *, | 707 | extern int ps3av_cmd_video_get_monitor_info(struct ps3av_pkt_av_get_monitor_info *, |
705 | u32); | 708 | u32); |
706 | 709 | ||
707 | struct ps3_vuart_port_device; | ||
708 | extern int ps3av_vuart_write(struct ps3_vuart_port_device *dev, | ||
709 | const void *buf, unsigned long size); | ||
710 | extern int ps3av_vuart_read(struct ps3_vuart_port_device *dev, void *buf, | ||
711 | unsigned long size, int timeout); | ||
712 | |||
713 | extern int ps3av_set_video_mode(u32, int); | 710 | extern int ps3av_set_video_mode(u32, int); |
714 | extern int ps3av_set_audio_mode(u32, u32, u32, u32, u32); | 711 | extern int ps3av_set_audio_mode(u32, u32, u32, u32, u32); |
715 | extern int ps3av_get_auto_mode(int); | 712 | extern int ps3av_get_auto_mode(int); |
@@ -722,5 +719,8 @@ extern int ps3av_video_mute(int); | |||
722 | extern int ps3av_audio_mute(int); | 719 | extern int ps3av_audio_mute(int); |
723 | extern int ps3av_dev_open(void); | 720 | extern int ps3av_dev_open(void); |
724 | extern int ps3av_dev_close(void); | 721 | extern int ps3av_dev_close(void); |
722 | extern void ps3av_register_flip_ctl(void (*flip_ctl)(int on, void *data), | ||
723 | void *flip_data); | ||
724 | extern void ps3av_flip_ctl(int on); | ||
725 | 725 | ||
726 | #endif /* _ASM_POWERPC_PS3AV_H_ */ | 726 | #endif /* _ASM_POWERPC_PS3AV_H_ */ |