# HG changeset patch
# User diego
# Date 1174122749 0
# Node ID 7b3021c6e8c0dd4490fa44c763a949dd89549a4d
# Parent  6d257bd87fce5e5d5b9881db10924da9f3af815e
Rename tdfx_vid_tst to tdfx_vid_test.

diff -r 6d257bd87fce -r 7b3021c6e8c0 drivers/Makefile
--- a/drivers/Makefile	Sat Mar 17 09:07:21 2007 +0000
+++ b/drivers/Makefile	Sat Mar 17 09:12:29 2007 +0000
@@ -11,7 +11,7 @@
 else
 MGA_VID_OBJ = mga_vid.o
 CFLAGS = -O2 -D__KERNEL__ -DMODULE $(INCLUDES) -Wall -include $(KERNEL_INCLUDES)/linux/modversions.h
-all: $(MGA_VID_OBJ) mga_vid_test tdfx_vid.o tdfx_vid_tst
+all: $(MGA_VID_OBJ) mga_vid_test tdfx_vid.o tdfx_vid_test
 endif
 
 mga_vid.o: mga_vid.c mga_vid.h
@@ -26,7 +26,7 @@
 tdfx_vid.o: tdfx_vid.c 3dfx.h
 	$(CC) $(CFLAGS) -c $<
 
-tdfx_vid_tst: tdfx_vid_tst.c
+tdfx_vid_test: tdfx_vid_test.c
 	$(CC) -O -o $@ $<
 
 install: $(MGA_VID_OBJ)
@@ -37,7 +37,7 @@
 dep depend:
 
 clean:
-	rm -f *.o *~ *.ko mga_vid_test tdfx_vid_tst
+	rm -f *.o *~ *.ko mga_vid_test tdfx_vid_test
 
 distclean: clean
 
diff -r 6d257bd87fce -r 7b3021c6e8c0 drivers/tdfx_vid_test.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/drivers/tdfx_vid_test.c	Sat Mar 17 09:12:29 2007 +0000
@@ -0,0 +1,98 @@
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <sys/ioctl.h>
+#include <inttypes.h>
+
+#include "tdfx_vid.h"
+
+
+static void print_tdfd_vid_cfg(tdfx_vid_config_t* cfg) {
+     printf("tdfx_vid version %d\n"
+	    "  Ram: %d\n"
+	    "  Screen: %d x %d\n",
+	    cfg->version,
+	    cfg->ram_size,
+	    cfg->screen_width, cfg->screen_height);	    
+}
+     
+
+int main(int argc, char** argv) {
+  int fd,i;
+  unsigned char *mem,*ptr;
+  tdfx_vid_agp_move_t move;
+  tdfx_vid_config_t cfg;
+  tdfx_vid_blit_t blit;
+
+  fd = open("/dev/tdfx_vid", O_RDWR);
+
+  if(fd <= 0) {
+    printf("Can't open /dev/tdfx_vid\n");
+    return 1;
+  }
+
+  if(ioctl(fd,TDFX_VID_GET_CONFIG,&cfg)) {
+    printf("Ioctl GET_CONFIG error\n");
+    close(fd);
+    return 1;
+  }
+  
+  print_tdfd_vid_cfg(&cfg);
+
+  mem = mmap( NULL, 640*480*2, PROT_READ | PROT_WRITE, MAP_SHARED,
+	      fd, 0);
+
+  if(mem == MAP_FAILED) {
+    printf("Memmap failed !!!!!\n");
+    return 1;
+  }
+
+/*   for(ptr = mem, i = 0 ; i < 640*480 ; i++) { */
+/*     ptr[0] = i & 0xFF; */
+/*     ptr[1] = (i & 0xFF); */
+/*     ptr += 2; */
+/*   } */
+    
+  memset(mem,0xFF,640*480*2);
+  
+  memset(&move, 0, sizeof(tdfx_vid_agp_move_t));
+  move.width = 640;
+  move.height = 240;
+  move.src_stride = 640;
+  move.dst_stride = 640*2;
+
+  if(ioctl(fd,TDFX_VID_AGP_MOVE,&move)) {
+    printf("AGP Move failed !!!!\n");
+    return 0;
+  }
+  
+  printf("AGP Move ????\n");
+  sleep(1);
+
+  blit.src = 0;
+  blit.src_stride = 640*2;
+  blit.src_x = blit.src_y = 0;
+  blit.src_w = 320;
+  blit.src_h = 240;
+  blit.src_format = cfg.screen_format;
+
+  blit.dst = 240*640*2+320;
+  blit.dst_stride = 640*2;
+  blit.dst_x = blit.dst_y = 0;
+  blit.dst_w = 320;
+  blit.dst_h = 240;
+  blit.dst_format = cfg.screen_format;
+
+  if(ioctl(fd,TDFX_VID_BLIT,&blit)) {
+    printf("Blit failed !!!!\n");
+    return 0;
+  }
+  
+  close(fd);
+  return 1;
+}
diff -r 6d257bd87fce -r 7b3021c6e8c0 drivers/tdfx_vid_tst.c
--- a/drivers/tdfx_vid_tst.c	Sat Mar 17 09:07:21 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/ioctl.h>
-#include <inttypes.h>
-
-#include "tdfx_vid.h"
-
-
-static void print_tdfd_vid_cfg(tdfx_vid_config_t* cfg) {
-     printf("tdfx_vid version %d\n"
-	    "  Ram: %d\n"
-	    "  Screen: %d x %d\n",
-	    cfg->version,
-	    cfg->ram_size,
-	    cfg->screen_width, cfg->screen_height);	    
-}
-     
-
-int main(int argc, char** argv) {
-  int fd,i;
-  unsigned char *mem,*ptr;
-  tdfx_vid_agp_move_t move;
-  tdfx_vid_config_t cfg;
-  tdfx_vid_blit_t blit;
-
-  fd = open("/dev/tdfx_vid", O_RDWR);
-
-  if(fd <= 0) {
-    printf("Can't open /dev/tdfx_vid\n");
-    return 1;
-  }
-
-  if(ioctl(fd,TDFX_VID_GET_CONFIG,&cfg)) {
-    printf("Ioctl GET_CONFIG error\n");
-    close(fd);
-    return 1;
-  }
-  
-  print_tdfd_vid_cfg(&cfg);
-
-  mem = mmap( NULL, 640*480*2, PROT_READ | PROT_WRITE, MAP_SHARED,
-	      fd, 0);
-
-  if(mem == MAP_FAILED) {
-    printf("Memmap failed !!!!!\n");
-    return 1;
-  }
-
-/*   for(ptr = mem, i = 0 ; i < 640*480 ; i++) { */
-/*     ptr[0] = i & 0xFF; */
-/*     ptr[1] = (i & 0xFF); */
-/*     ptr += 2; */
-/*   } */
-    
-  memset(mem,0xFF,640*480*2);
-  
-  memset(&move, 0, sizeof(tdfx_vid_agp_move_t));
-  move.width = 640;
-  move.height = 240;
-  move.src_stride = 640;
-  move.dst_stride = 640*2;
-
-  if(ioctl(fd,TDFX_VID_AGP_MOVE,&move)) {
-    printf("AGP Move failed !!!!\n");
-    return 0;
-  }
-  
-  printf("AGP Move ????\n");
-  sleep(1);
-
-  blit.src = 0;
-  blit.src_stride = 640*2;
-  blit.src_x = blit.src_y = 0;
-  blit.src_w = 320;
-  blit.src_h = 240;
-  blit.src_format = cfg.screen_format;
-
-  blit.dst = 240*640*2+320;
-  blit.dst_stride = 640*2;
-  blit.dst_x = blit.dst_y = 0;
-  blit.dst_w = 320;
-  blit.dst_h = 240;
-  blit.dst_format = cfg.screen_format;
-
-  if(ioctl(fd,TDFX_VID_BLIT,&blit)) {
-    printf("Blit failed !!!!\n");
-    return 0;
-  }
-  
-  close(fd);
-  return 1;
-}