[Mplayer-cvslog] CVS: main/vidix/drivers mga_vid.c,NONE,1.1 mga_vid.h,NONE,1.1 Makefile,1.3,1.4

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/vidix/drivers
In directory mplayer:/var/tmp.root/cvs-serv16709

Modified Files:
	Makefile 
Added Files:
	mga_vid.c mga_vid.h 
Log Message:
added mga_vid (also playback->offset is not set (fixing it on monday)

--- NEW FILE ---
/*
    Matrox MGA driver
    
    ported to VIDIX by Alex Beregszaszi

    YUY2 support (see config.format) added by A'rpi/ESP-team
    double buffering added by A'rpi/ESP-team


    DONT USE THIS! IT'S UNDER DEVELOPEMENT! USE MGA_VID KERNELDRIVER!
*/

/*
 * Original comment:
 *
 * mga_vid.c
 *
 * Copyright (C) 1999 Aaron Holtzman
 * 
[...1846 lines suppressed...]
	    to->depth = to->flags = 0;
	    return(ENOTSUP);
    }
    
    to->depth = VID_DEPTH_12BPP | VID_DEPTH_16BPP | VID_DEPTH_32BPP;
    to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK;
    return(0);
}

unsigned int vixGetVersion(void)
{
    return(VIDIX_VERSION);
}

int vixGetCapability(vidix_capability_t *to)
{
    memcpy(to, &mga_cap, sizeof(vidix_capability_t));
    return(0);
}


--- NEW FILE ---
/*
 *
 * mga_vid.h
 *
 * Copyright (C) 1999 Aaron Holtzman
 * 
 * Matrox MGA G200/G400 YUV Video Interface module Version 0.1.0
 * 
 * BES == Back End Scaler
 * 
 * This software has been released under the terms of the GNU Public
 * license. See http://www.gnu.org/copyleft/gpl.html for details.
 */

#ifndef __LINUX_MGAVID_H
#define __LINUX_MGAVID_H

//#include <inttypes.h>

typedef struct mga_vid_config_s
{
uint16_t version;
uint16_t card_type;
uint32_t ram_size;
uint32_t src_width;
uint32_t src_height;
uint32_t dest_width;
uint32_t dest_height;
uint32_t x_org;
uint32_t y_org;
uint8_t  colkey_on;
uint8_t  colkey_red;
uint8_t  colkey_green;
uint8_t  colkey_blue;
uint32_t format;
uint32_t frame_size;
uint32_t num_frames;
} mga_vid_config_t;

#if 0
#define MGA_VID_FORMAT_YV12 0x32315659
#define MGA_VID_FORMAT_IYUV (('I'<<24)|('Y'<<16)|('U'<<8)|'V')
#define MGA_VID_FORMAT_I420 (('I'<<24)|('4'<<16)|('2'<<8)|'0')
#define MGA_VID_FORMAT_YUY2 (('Y'<<24)|('U'<<16)|('Y'<<8)|'2')
#define MGA_VID_FORMAT_UYVY (('U'<<24)|('Y'<<16)|('V'<<8)|'Y')
#endif

#define MGA_VID_CONFIG    _IOR('J', 1, mga_vid_config_t)
#define MGA_VID_ON        _IO ('J', 2)
#define MGA_VID_OFF       _IO ('J', 3)
#define MGA_VID_FSEL _IOR('J', 4, int)

#define MGA_G200 0x1234
#define MGA_G400 0x5678

#define MGA_VID_VERSION 0x0201

#endif

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile	13 Jan 2002 11:39:06 -0000	1.3
+++ Makefile	13 Jan 2002 16:54:32 -0000	1.4
@@ -35,7 +35,13 @@
 MGA_LIBS=-L../../libdha -ldha -lm
 MGA_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -Wall -W
 
-all:    $(RADEON_VID) $(RAGE128_VID) $(NVIDIA_VID) $(GENFB_VID) #$(MGA_VID)
+MGA_CRTC2_VID=mga_crtc2_vid.so
+MGA_CRTC2_SRCS=mga_vid.c
+MGA_CRTC2_OBJS=mga_crtc2_vid.o
+MGA_CRTC2_LIBS=-L../../libdha -ldha -lm
+MGA_CRTC2_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -Wall -W -DCRTC2
+
+all:    $(RADEON_VID) $(RAGE128_VID) $(NVIDIA_VID) $(GENFB_VID) $(MGA_VID) $(MGA_CRTC2_VID)
 
 
 .SUFFIXES: .c .o
@@ -71,6 +77,12 @@
 
 $(MGA_VID):     $(MGA_OBJS)
 	$(LD) $(MGA_LIBS) -shared -soname $(MGA_VID) -o $(MGA_VID) $(MGA_OBJS)
+
+$(MGA_CRTC2_OBJS):    $(MGA_CRTC2_SRCS)
+	$(CC) -c $(MGA_CRTC2_CFLAGS) -o $@ $<
+
+$(MGA_CRTC2_VID):     $(MGA_CRTC2_OBJS)
+	$(LD) $(MGA_CRTC2_LIBS) -shared -soname $(MGA_CRTC2_VID) -o $(MGA_CRTC2_VID) $(MGA_CRTC2_OBJS)
 
 clean:
 	rm -f *.o *.so *~