diff --git a/dmx_usb_module/.git/config b/dmx_usb_module/.git/config --- a/dmx_usb_module/.git/config +++ b/dmx_usb_module/.git/config @@ -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 diff --git a/dmx_usb_module/.git/index b/dmx_usb_module/.git/index index 490d8049f10dd387039cf4845ebf46dff3591e96..2b6854d1af3c57fdd1b94b4178d7ce3700cf44be GIT binary patch literal 552 zc${YWV1LIc)2Idz)bvMF~ov=C) zTJn3+&&rpJg5NiZ=)XO|z@?X-S(2HamtU0100sV^emR@Yj%o5gJG~ns0y0mt8`V5U zEdzzX1h#1jDT&%&Yq`T6wT~y1n=^1aXC&sOr{?6RGhla@W)GS0;)NoMV0ewD(-*#>gZ-0y|>Q!^3)ZdikcWWQ*tZfON*2A zlELn=%zl=O=AMbD=EM{oNZ9BiqN4hBVU_ra_=vetiZ@eEAk4{txF^Br9E^sVGYQok zCX=f_)uJQzdzqZrEL-X+CZN*Yb=8A`4{A<)NosKk&{058-M}SrO7FzoCBah!jW}x# JZWL4&0RZoZt9bwb diff --git a/dmx_usb_module/.git/refs/heads/master b/dmx_usb_module/.git/refs/heads/master --- a/dmx_usb_module/.git/refs/heads/master +++ b/dmx_usb_module/.git/refs/heads/master @@ -1,1 +1,1 @@ -3bfaeb835bec3d26d8ae0fd9d6b9b1dc15eafa7a +74a4067667b4d009d33ce7f52045786735b0a137 diff --git a/dmx_usb_module/Makefile b/dmx_usb_module/Makefile --- a/dmx_usb_module/Makefile +++ b/dmx_usb_module/Makefile @@ -13,7 +13,7 @@ PWD := $(shell pwd) 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 @@ clean: 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 diff --git a/dmx_usb_module/dmx_usb.c b/dmx_usb_module/dmx_usb.c --- a/dmx_usb_module/dmx_usb.c +++ b/dmx_usb_module/dmx_usb.c @@ -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 @@ static int dmx_usb_probe(struct usb_inte 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; } diff --git a/dmx_usb_module/dmx_usb_test.c b/dmx_usb_module/dmx_usb_test.c --- a/dmx_usb_module/dmx_usb_test.c +++ b/dmx_usb_module/dmx_usb_test.c @@ -23,7 +23,7 @@ int main(int argc, char* argv[]) } for (i = 0; i < 513;i++) { - buffer[i] = 0x00; + buffer[i] = i; } buffer[512] = 0x55; diff --git a/dmx_usb_module/pyout b/dmx_usb_module/pyout --- a/dmx_usb_module/pyout +++ b/dmx_usb_module/pyout @@ -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"