rk screen:delete screen.h

This commit is contained in:
yxj
2013-01-16 21:21:10 +08:00
parent 8fc2f93b48
commit 6a5e229e02
4 changed files with 6 additions and 121 deletions

View File

@@ -1,10 +1,8 @@
#include <linux/fb.h>
#include <linux/rk_fb.h>
#include <linux/delay.h>
#include "../../rk29_fb.h"
#include <mach/gpio.h>
#include <mach/iomux.h>
#include <mach/board.h>
#include "screen.h"
/* Base */

View File

@@ -5,7 +5,7 @@
#include <mach/iomux.h>
#include <mach/board.h>
#include "../../rockchip/hdmi/rk_hdmi.h"
#include "screen.h"
#ifdef CONFIG_RK610_LVDS
#include "../transmitter/rk610_lcd.h"

View File

@@ -1,10 +1,10 @@
#include <linux/fb.h>
#include <linux/delay.h>
#include "../../rk29_fb.h"
#include <mach/gpio.h>
#include <mach/iomux.h>
#include <mach/board.h>
#include "screen.h"
#include <linux/rk_fb.h>
/* Base */
#define OUT_TYPE SCREEN_RGB
@@ -52,7 +52,7 @@ static struct rk29lcd_info *gLcd_info = NULL;
int init(void);
int standby(u8 enable);
void set_lcd_info(struct rk29fb_screen *screen, struct rk2918lcd_info *lcd_info )
void set_lcd_info(struct rk29fb_screen *screen, struct rk29lcd_info *lcd_info )
{
/* screen type & face */
screen->type = OUT_TYPE;

View File

@@ -1,113 +0,0 @@
#ifndef _SCREEN_H
#define _SCREEN_H
#include <mach/board.h>
typedef enum _SCREEN_TYPE {
SCREEN_NULL = 0,
SCREEN_RGB,
SCREEN_LVDS,
SCREEN_MCU,
SCREEN_TVOUT,
SCREEN_HDMI,
} SCREEN_TYPE;
typedef enum _REFRESH_STAGE {
REFRESH_PRE = 0,
REFRESH_END,
} REFRESH_STAGE;
typedef enum _MCU_IOCTL {
MCU_WRCMD = 0,
MCU_WRDATA,
MCU_SETBYPASS,
} MCU_IOCTL;
typedef enum _MCU_STATUS {
MS_IDLE = 0,
MS_MCU,
MS_EBOOK,
MS_EWAITSTART,
MS_EWAITEND,
MS_EEND,
} MCU_STATUS;
/* Screen description */
typedef struct rk29fb_screen {
/* screen type & hardware connect format & out face */
u16 type;
u16 hw_format;
u16 face;
/* Screen size */
u16 x_res;
u16 y_res;
u16 width;
u16 height;
u32 mode;
/* Timing */
u32 pixclock;
u16 left_margin;
u16 right_margin;
u16 hsync_len;
u16 upper_margin;
u16 lower_margin;
u16 vsync_len;
#ifdef CONFIG_HDMI_DUAL_DISP
/* Scaler mode Timing */
u32 s_pixclock;
u16 s_left_margin;
u16 s_right_margin;
u16 s_hsync_len;
u16 s_upper_margin;
u16 s_lower_margin;
u16 s_vsync_len;
u16 s_hsync_st;
u16 s_vsync_st;
bool s_den_inv;
bool s_hv_sync_inv;
bool s_clk_inv;
#endif
u8 hdmi_resolution;
/* mcu need */
u8 mcu_wrperiod;
u8 mcu_usefmk;
u8 mcu_frmrate;
/* Pin polarity */
u8 pin_hsync;
u8 pin_vsync;
u8 pin_den;
u8 pin_dclk;
u32 lcdc_aclk;
u8 pin_dispon;
/* Swap rule */
u8 swap_rb;
u8 swap_rg;
u8 swap_gb;
u8 swap_delta;
u8 swap_dumy;
/* Operation function*/
int (*init)(void);
int (*standby)(u8 enable);
int (*refresh)(u8 arg);
int (*scandir)(u16 dir);
int (*disparea)(u8 area);
int (*sscreen_get)(struct rk29fb_screen *screen, u8 resolution);
int (*sscreen_set)(struct rk29fb_screen *screen, bool type);// 1: use scaler 0:bypass
} rk_screen;
extern void set_lcd_info(struct rk29fb_screen *screen, struct rk29lcd_info *lcd_info);
extern void set_tv_info(struct rk29fb_screen *screen);
extern void set_hdmi_info(struct rk29fb_screen *screen);
#endif