Mercurial > code > home > repos > light9

changeset 875:2b2ad8e7cb9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update dmx_usb. ok on kernel 3.5.0 Ignore-this: 207b5a346c5e1e781d46ddcb44d510bf
author Drew Perttula <drewp@bigasterisk.com>
date Fri, 07 Jun 2013 06:40:07 +0000
parents 167a61d3cfbf
children e263c4bd73f9
files dmx_usb_module/.git/config dmx_usb_module/.git/index dmx_usb_module/.git/refs/heads/master dmx_usb_module/Makefile dmx_usb_module/dmx_usb.c dmx_usb_module/dmx_usb_test.c dmx_usb_module/pyout
diffstat 7 files changed, 16 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/dmx_usb_module/.git/config	Thu Jun 06 08:23:17 2013 +0000
+++ b/dmx_usb_module/.git/config	Fri Jun 07 06:40:07 2013 +0000
@@ -1,3 +1,6 @@
 [core]
 	repositoryformatversion = 0
 	filemode = true
+[remote "github"]
+	url = git://github.com/lowlander/dmx_usb_module.git
+	fetch = +refs/heads/master:refs/remotes/github/master
Binary file dmx_usb_module/.git/index has changed
--- a/dmx_usb_module/.git/refs/heads/master	Thu Jun 06 08:23:17 2013 +0000
+++ b/dmx_usb_module/.git/refs/heads/master	Fri Jun 07 06:40:07 2013 +0000
@@ -1,1 +1,1 @@
-3bfaeb835bec3d26d8ae0fd9d6b9b1dc15eafa7a
+74a4067667b4d009d33ce7f52045786735b0a137
--- a/dmx_usb_module/Makefile	Thu Jun 06 08:23:17 2013 +0000
+++ b/dmx_usb_module/Makefile	Fri Jun 07 06:40:07 2013 +0000
@@ -13,7 +13,7 @@
 
 default:
 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
-	gcc -O2 -pipe dmx_usb_test.c -o dmx_usb_test
+	gcc -O2 -pipe -Wall dmx_usb_test.c -o dmx_usb_test
 
 endif
 
@@ -23,7 +23,6 @@
 	rm -f dmx_usb.mod.c
 	rm -f .dmx_usb.*
 	rm -rf .tmp_versions
+	rm -f Module.markers  modules.order  Module.symvers
 
 
-drew:
-	gcc dmx_usb.c -o dmx_usb.o -I/usr/src/linux-source-2.6.15/include
\ No newline at end of file
--- a/dmx_usb_module/dmx_usb.c	Thu Jun 06 08:23:17 2013 +0000
+++ b/dmx_usb_module/dmx_usb.c	Fri Jun 07 06:40:07 2013 +0000
@@ -50,6 +50,10 @@
 #define info(format, arg...) do { printk(KERN_INFO __FILE__ ": " format "\n" , ## arg); } while (0)
 #endif
 
+#ifndef err
+#define err(format, arg...) do { printk(KERN_INFO __FILE__ ": (error) " format "\n" , ## arg); } while (0)
+#endif
+
 /* Version Information */
 #define DRIVER_VERSION "v0.1.20111215"
 #define DRIVER_AUTHOR "Erwin Rol, erwin@erwinrol.com"
@@ -631,8 +635,8 @@
 	int retval = -ENOMEM;
 
 	/* See if the device offered us matches what we can accept */
-	if ((udev->descriptor.idVendor != FTDI_VID) ||
-	    (udev->descriptor.idProduct != FTDI_8U232AM_PID)) {
+	if ((le16_to_cpu(udev->descriptor.idVendor) != FTDI_VID) ||
+	    (le16_to_cpu(udev->descriptor.idProduct) != FTDI_8U232AM_PID)) {
 		return -ENODEV;
 	}
 
--- a/dmx_usb_module/dmx_usb_test.c	Thu Jun 06 08:23:17 2013 +0000
+++ b/dmx_usb_module/dmx_usb_test.c	Fri Jun 07 06:40:07 2013 +0000
@@ -23,7 +23,7 @@
 	}
 
 	for (i = 0; i < 513;i++) {
-		buffer[i] = 0x00;	
+		buffer[i] = i;	
 	}
 
 	buffer[512] = 0x55;
--- a/dmx_usb_module/pyout	Thu Jun 06 08:23:17 2013 +0000
+++ b/dmx_usb_module/pyout	Fri Jun 07 06:40:07 2013 +0000
@@ -1,7 +1,7 @@
 
 from dmx import Dmx
 
-d = Dmx()
+d = Dmx(port="/dev/dmx1")
 while 1:
-    d.write("\xff" * 100, times=1)
-
+    d.write("\x00" * 100)
+    print "wrote"