light9 Changeset - 2b2ad8e7cb9f

Changeset - 2b2ad8e7cb9f

Parent rev.

Child rev.

[Not reviewed]

default

0 7 0

Drew Perttula - 12 years ago 2013-06-07 06:40:07
drewp@bigasterisk.com

update dmx_usb. ok on kernel 3.5.0
Ignore-this: 207b5a346c5e1e781d46ddcb44d510bf

7 files changed with 16 insertions and 10 deletions:

dmx_usb_module/.git/config

dmx_usb_module/.git/index

bin+mod

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

0 comments (0 inline, 0 general)

dmx_usb_module/.git/config

➞

Show inline comments

 [core]
 	repositoryformatversion = 0
 	filemode = true
 [remote "github"]
 	url = git://github.com/lowlander/dmx_usb_module.git
 	fetch = +refs/heads/master:refs/remotes/github/master

dmx_usb_module/.git/index

➞

Show inline comments

binary diff not shown

dmx_usb_module/.git/refs/heads/master

➞

Show inline comments

		~~3bfaeb835bec3d26d8ae0fd9d6b9b1dc15eafa7a~~
		74a4067667b4d009d33ce7f52045786735b0a137

dmx_usb_module/Makefile

➞

Show inline comments

@@ @@ -10,20 +10,19 @@ else @@
 KDIR	:= /lib/modules/$(shell uname -r)/build
 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
 clean:
 	rm -f *.o *.ko
 	rm -f dmx_usb_test
 	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 @@

dmx_usb_module/dmx_usb.c

➞

Show inline comments

@@ @@ -47,12 +47,16 @@ @@
 #define dbg(format, arg...) do { if (debug) printk(KERN_DEBUG __FILE__ ": " format "\n" , ## arg); } while (0)
 #ifndef info
 #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"
 #define DRIVER_DESC "DMX USB Driver"
 /* Module parameters */
@@ @@ -628,14 +632,14 @@ static int dmx_usb_probe(struct usb_inte @@
 	struct usb_endpoint_descriptor *endpoint;
 	size_t buffer_size;
 	int i;
 	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;
+	}
 	/* allocate memory for our device state and initialize it */
 	dev = kmalloc (sizeof(struct dmx_usb_device), GFP_KERNEL);
 	if (dev == NULL) {

dmx_usb_module/dmx_usb_test.c

➞

Show inline comments

@@ @@ -20,13 +20,13 @@ int main(int argc, char* argv[]) @@
 	if (fd < 0) {
 		perror("open");
 		exit(-1);
+	}
 	for (i = 0; i < 513;i++) {
-		buffer[i] = 0x00;
+		buffer[i] = i;
+	}
 	buffer[512] = 0x55;
 	while(1) {
 		res = write(fd, buffer, 513);

dmx_usb_module/pyout

➞

Show inline comments

 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"

0 comments (0 inline, 0 general)