[MPlayer-cvslog] r22868 - in trunk/vidix: Makefile cyberblade_regs.h cyberblade_vid.c drivers mach64.h mach64_vid.c mga_vid.c nvidia_vid.c pm3_regs.h pm3_vid.c radeon.h radeon_vid.c savage_regs.h savage_vid.c sis_bridge.c sis_defs.h sis_regs.h sis_vid.c unichrome_regs.h unichrome_vid.c

[diego]

Author: diego
Date: Sun Apr  1 02:02:43 2007
New Revision: 22868

Added:
   trunk/vidix/cyberblade_regs.h
      - copied unchanged from r22863, /trunk/vidix/drivers/cyberblade_regs.h
   trunk/vidix/cyberblade_vid.c
      - copied, changed from r22863, /trunk/vidix/drivers/cyberblade_vid.c
   trunk/vidix/mach64.h
      - copied unchanged from r22863, /trunk/vidix/drivers/mach64.h
   trunk/vidix/mach64_vid.c
      - copied, changed from r22863, /trunk/vidix/drivers/mach64_vid.c
   trunk/vidix/mga_vid.c
      - copied, changed from r22863, /trunk/vidix/drivers/mga_vid.c
   trunk/vidix/nvidia_vid.c
      - copied, changed from r22863, /trunk/vidix/drivers/nvidia_vid.c
   trunk/vidix/pm3_regs.h
      - copied unchanged from r22863, /trunk/vidix/drivers/pm3_regs.h
   trunk/vidix/pm3_vid.c
      - copied, changed from r22863, /trunk/vidix/drivers/pm3_vid.c
   trunk/vidix/radeon.h
      - copied unchanged from r22863, /trunk/vidix/drivers/radeon.h
   trunk/vidix/radeon_vid.c
      - copied, changed from r22863, /trunk/vidix/drivers/radeon_vid.c
   trunk/vidix/savage_regs.h
      - copied unchanged from r22863, /trunk/vidix/drivers/savage_regs.h
   trunk/vidix/savage_vid.c
      - copied, changed from r22863, /trunk/vidix/drivers/savage_vid.c
   trunk/vidix/sis_bridge.c
      - copied, changed from r22863, /trunk/vidix/drivers/sis_bridge.c
   trunk/vidix/sis_defs.h
      - copied unchanged from r22863, /trunk/vidix/drivers/sis_defs.h
   trunk/vidix/sis_regs.h
      - copied unchanged from r22863, /trunk/vidix/drivers/sis_regs.h
   trunk/vidix/sis_vid.c
      - copied, changed from r22863, /trunk/vidix/drivers/sis_vid.c
   trunk/vidix/unichrome_regs.h
      - copied unchanged from r22863, /trunk/vidix/drivers/unichrome_regs.h
   trunk/vidix/unichrome_vid.c
      - copied, changed from r22863, /trunk/vidix/drivers/unichrome_vid.c
Removed:
   trunk/vidix/drivers/
Modified:
   trunk/vidix/Makefile

Log:
Move driver files directly into the vidix directory.


Modified: trunk/vidix/Makefile
==============================================================================
--- trunk/vidix/Makefile	(original)
+++ trunk/vidix/Makefile	Sun Apr  1 02:02:43 2007
@@ -3,18 +3,15 @@ include ../config.mak
 LIBNAME_MPLAYER = libvidix.a
 
 SRCS_MPLAYER    = vidixlib.c \
-                  $(wildcard drivers/*.c)
+                  $(wildcard *.c)
 
-OBJS_MPLAYER    = drivers/mga_crtc2_vid.o \
-                  drivers/rage128_vid.o \
+OBJS_MPLAYER    = mga_crtc2_vid.o \
+                  rage128_vid.o \
 
 include ../mpcommon.mak
 
-drivers/mga_crtc2_vid.o: drivers/mga_vid.c
+mga_crtc2_vid.o: mga_vid.c
 	$(CC) -c $(CFLAGS) -DCRTC2 -o $@ $<
 
-drivers/rage128_vid.o: drivers/radeon_vid.c
+rage128_vid.o: radeon_vid.c
 	$(CC) -c $(CFLAGS) -DRAGE128 -o $@ $<
-
-clean::
-	rm -f drivers/*.o drivers/*~

Copied: trunk/vidix/cyberblade_vid.c (from r22863, /trunk/vidix/drivers/cyberblade_vid.c)
==============================================================================
--- /trunk/vidix/drivers/cyberblade_vid.c	(original)
+++ trunk/vidix/cyberblade_vid.c	Sun Apr  1 02:02:43 2007
@@ -43,12 +43,12 @@
 #include <inttypes.h>
 #include <unistd.h>
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "../libdha/libdha.h"
+#include "../libdha/pci_ids.h"
+#include "../libdha/pci_names.h"
+#include "../config.h"
 
 #include "cyberblade_regs.h"
 

Copied: trunk/vidix/mach64_vid.c (from r22863, /trunk/vidix/drivers/mach64_vid.c)
==============================================================================
--- /trunk/vidix/drivers/mach64_vid.c	(original)
+++ trunk/vidix/mach64_vid.c	Sun Apr  1 02:02:43 2007
@@ -13,17 +13,17 @@
 #include <inttypes.h>
 #include <fcntl.h>
 
-#include "../../config.h"
-#include "../../libavutil/common.h"
-#include "../../mpbswap.h"
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
+#include "../config.h"
+#include "../libavutil/common.h"
+#include "../mpbswap.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "../libdha/libdha.h"
+#include "../libdha/pci_ids.h"
+#include "../libdha/pci_names.h"
 
 #include "mach64.h"
-#include "../../version.h"
+#include "../version.h"
 
 #define UNUSED(x) ((void)(x)) /**< Removes warning about unused arguments */
 

Copied: trunk/vidix/mga_vid.c (from r22863, /trunk/vidix/drivers/mga_vid.c)
==============================================================================
--- /trunk/vidix/drivers/mga_vid.c	(original)
+++ trunk/vidix/mga_vid.c	Sun Apr  1 02:02:43 2007
@@ -54,11 +54,11 @@
 #include <math.h>
 #include <inttypes.h>
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "../libdha/libdha.h"
+#include "../libdha/pci_ids.h"
+#include "../libdha/pci_names.h"
 
 #ifdef __MINGW32__
 #define ENOTSUP 134

Copied: trunk/vidix/nvidia_vid.c (from r22863, /trunk/vidix/drivers/nvidia_vid.c)
==============================================================================
--- /trunk/vidix/drivers/nvidia_vid.c	(original)
+++ trunk/vidix/nvidia_vid.c	Sun Apr  1 02:02:43 2007
@@ -18,14 +18,14 @@
 #include <unistd.h>
 
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
-#include "../../libavutil/common.h"
-#include "../../mpbswap.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "../libdha/libdha.h"
+#include "../libdha/pci_ids.h"
+#include "../libdha/pci_names.h"
+#include "../config.h"
+#include "../libavutil/common.h"
+#include "../mpbswap.h"
 
 
 pciinfo_t pci_info;

Copied: trunk/vidix/pm3_vid.c (from r22863, /trunk/vidix/drivers/pm3_vid.c)
==============================================================================
--- /trunk/vidix/drivers/pm3_vid.c	(original)
+++ trunk/vidix/pm3_vid.c	Sun Apr  1 02:02:43 2007
@@ -25,12 +25,12 @@
 #include <inttypes.h>
 #include <unistd.h>
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "../libdha/libdha.h"
+#include "../libdha/pci_ids.h"
+#include "../libdha/pci_names.h"
+#include "../config.h"
 
 #include "pm3_regs.h"
 

Copied: trunk/vidix/radeon_vid.c (from r22863, /trunk/vidix/drivers/radeon_vid.c)
==============================================================================
--- /trunk/vidix/drivers/radeon_vid.c	(original)
+++ trunk/vidix/radeon_vid.c	Sun Apr  1 02:02:43 2007
@@ -16,14 +16,14 @@
 #include <math.h>
 #include <inttypes.h>
 
-#include "../../config.h"
-#include "../../libavutil/common.h"
-#include "../../mpbswap.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
+#include "../config.h"
+#include "../libavutil/common.h"
+#include "../mpbswap.h"
+#include "../libdha/pci_ids.h"
+#include "../libdha/pci_names.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "../libdha/libdha.h"
 #include "radeon.h"
 
 #ifdef HAVE_X11

Copied: trunk/vidix/savage_vid.c (from r22863, /trunk/vidix/drivers/savage_vid.c)
==============================================================================
--- /trunk/vidix/drivers/savage_vid.c	(original)
+++ trunk/vidix/savage_vid.c	Sun Apr  1 02:02:43 2007
@@ -38,12 +38,12 @@
 #include <unistd.h>
 #include <math.h>
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "../libdha/libdha.h"
+#include "../libdha/pci_ids.h"
+#include "../libdha/pci_names.h"
+#include "../config.h"
 
 #include "savage_regs.h"
 

Copied: trunk/vidix/sis_bridge.c (from r22863, /trunk/vidix/drivers/sis_bridge.c)
==============================================================================
--- /trunk/vidix/drivers/sis_bridge.c	(original)
+++ trunk/vidix/sis_bridge.c	Sun Apr  1 02:02:43 2007
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "../../libdha/libdha.h"
+#include "../libdha/libdha.h"
 #include "sis_regs.h"
 #include "sis_defs.h"
 

Copied: trunk/vidix/sis_vid.c (from r22863, /trunk/vidix/drivers/sis_vid.c)
==============================================================================
--- /trunk/vidix/drivers/sis_vid.c	(original)
+++ trunk/vidix/sis_vid.c	Sun Apr  1 02:02:43 2007
@@ -30,12 +30,12 @@
 #include <inttypes.h>
 #include <unistd.h>
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "../libdha/libdha.h"
+#include "../libdha/pci_ids.h"
+#include "../libdha/pci_names.h"
+#include "../config.h"
 
 #include "sis_regs.h"
 #include "sis_defs.h"

Copied: trunk/vidix/unichrome_vid.c (from r22863, /trunk/vidix/drivers/unichrome_vid.c)
==============================================================================
--- /trunk/vidix/drivers/unichrome_vid.c	(original)
+++ trunk/vidix/unichrome_vid.c	Sun Apr  1 02:02:43 2007
@@ -39,12 +39,12 @@
 #include <inttypes.h>
 #include <unistd.h>
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "../libdha/libdha.h"
+#include "../libdha/pci_ids.h"
+#include "../libdha/pci_names.h"
+#include "../config.h"
 
 #include "unichrome_regs.h"