Changeset 41d46ae in avrstuff

Timestamp:

Sep 3, 2012, 11:09:37 PM (12 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

0262b6e

Parents:

c8ec8ce

Message:

Fix USB communication code. Now to debug the ICSP part...

git-svn-id: ​svn://pulkomandy.tk/avrstuff@68 c6672c3c-f6b6-47f9-9001-1fd6b12fecbe

File:

• V-USB_Dev/firmwares/herePic/driver/icsp.h (modified) (4 diffs)

V-USB_Dev/firmwares/herePic/driver/icsp.h

@@ -5 +5 @@
  */
 
+#include <assert.h>
+#include <errno.h>
 #include <string.h>
 
@@ -17 +19 @@
                 uint16_t Execute(ICSPCommands command, uint16_t param = 0)
                 {
-                        // TODO send the command to the device
+                        //std::cout << "Sending command " << command << " " << param << " to the device" << std::endl; 
+
+                        // send the command to the device
                         uint16 length;
                         uint8 reqType = USB_REQTYPE_VENDOR;
@@ -23 +27 @@
                         {
                                 length = 2;
-                                reqType |= USB_REQTYPE_DEVICE_OUT;
+                                reqType |= USB_REQTYPE_DEVICE_IN; // Device to host
                         } else {
                                 length = 0;
-                                reqType |= USB_REQTYPE_DEVICE_IN;
+                                reqType |= USB_REQTYPE_DEVICE_OUT; // Host to device
                         }
 
                         ssize_t result = fDevice.ControlTransfer(reqType, command, param, 0,
-                                length, &param);
+                                length, length == 0 ? NULL:&param);
                         if (result == length) {
                                 // We transferred as much bytes as we wanted.
@@ -37 +41 @@
                         } else {
                                 // Not enough bytes transferred, or the result is an error code
-                                std::cerr << "USB communication error " << result
-                                        << "(" << strerror(result) << ")" << std::endl;;
+                                std::cerr << "USB communication error " << errno
+                                        << "(" << strerror(errno) << ")" << std::endl;;
                                 return result;
                         }