Modified:

xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c
xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.h
xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_mm_i2c.c Add code to
    access and initialize multimedia i2c bus. Hook it up.

1 files changed, 77 insertions, 0 deletions

diff --git a/src/radeon_video.h b/src/radeon_video.h
new file mode 100644
index 00000000..24016851
--- /dev/null
+++ b/src/radeon_video.h
@@ -0,0 +1,77 @@
+#ifndef __RADEON_VIDEO_H__
+#define __RADEON_VIDEO_H__
+
+#include "xf86i2c.h"
+#include "fi1236.h"
+#include "msp3430.h"
+#include "tda9885.h"
+#include "i2c_def.h"
+
+/* Xvideo port struct */
+typedef struct {
+   CARD32	 transform_index;
+   CARD32	 gamma; /* gamma value x 1000 */
+   int           brightness;
+   int           saturation;
+   int           hue;
+   int           contrast;
+   int           red_intensity;
+   int           green_intensity;
+   int           blue_intensity;
+   int		 ecp_div;
+
+     /* i2c bus and devices */
+   I2CBusPtr     i2c;
+   CARD32        radeon_i2c_timing;
+   CARD32        radeon_M;
+   CARD32        radeon_N;
+   CARD32        i2c_status;
+   CARD32        i2c_cntl;
+   
+   FI1236Ptr     fi1236;
+   CARD8         tuner_type;
+   MSP3430Ptr    msp3430;
+   TDA9885Ptr    tda9885;
+   
+   Bool          video_stream_active;
+   int           encoding;
+   CARD32        frequency;
+   int           volume;
+   Bool          mute;
+   int           sap_channel;
+   int           v;
+   CARD32        adjustment; /* general purpose variable */
+   
+#define METHOD_BOB      0
+#define METHOD_SINGLE   1
+#define METHOD_WEAVE    2
+#define METHOD_ADAPTIVE 3
+
+   int           overlay_deinterlacing_method;
+   
+   int           capture_vbi_data;
+
+   int           dec_brightness;
+   int           dec_saturation;
+   int           dec_hue;
+   int           dec_contrast;
+
+   Bool          doubleBuffer;
+   unsigned char currentBuffer;
+   RegionRec     clip;
+   CARD32        colorKey;
+   CARD32        videoStatus;
+   Time          offTime;
+   Time          freeTime;
+   Bool          autopaint_colorkey;
+   Bool		 crt2; /* 0=CRT1, 1=CRT2 */
+
+   Atom          device_id, location_id, instance_id;
+} RADEONPortPrivRec, *RADEONPortPrivPtr;
+
+
+void RADEONInitI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
+void RADEONResetI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
+
+
+#endif