Changeset 8659a17 in avrstuff

Timestamp:

Sep 3, 2012, 8:21:47 PM (12 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

c8ec8ce

Parents:

f0689d3

Message:

Progress on the host driver. Still untested.

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

Location:

V-USB_Dev/firmwares/herePic

Files:

• driver/Makefile (modified) (1 diff)
• driver/herepic.cpp (modified) (5 diffs)
• driver/icsp.h (added)
• main.c (modified) (3 diffs)
• shared.h (added)

V-USB_Dev/firmwares/herePic/driver/Makefile

@@ -1 @@
-herepic: herepic.cpp
-        g++ -o $@ $^ -Os -Wall -ldevice
+herepic: herepic.cpp icsp.h ../shared.h
+        g++ -o $@ $< -Os -Wall -ldevice

V-USB_Dev/firmwares/herePic/driver/herepic.cpp

@@ -15 +15 @@
 #include <USBKit.h>
 
+#include "../shared.h"
+#include "icsp.h"
 
-// We need a subclass of USBRoster to enumerate devices. The Deviceadded hook
-// will be called for all plugged devices. If we don't find the correct one,
-// it will also be called later, as devices are plugged. So we can wait for the
-// right device to come in !
+
+// We need a subclass of USBRoster to enumerate devices.
 class MyUSBRoster: public BUSBRoster {
         public:
@@ -35 +35 @@
                 }
 
+                /* The DeviceAdded hook will be called for all plugged devices.
+                If we don't find the correct one, the method will also be called later,
+                as devices are plugged. So we can wait for the right device to come in!
+                */
                 status_t DeviceAdded(BUSBDevice* device)
                 {
@@ -41 +45 @@
                                 && strcmp(device->ProductString(), "HerePic") == 0)
                         {
-                                std::cout << "Programmer found !" << std::endl;
-                                // TODO send message to main app to tell it we're ready to go.
                                 fDevice = device;
+                                // Notify main thread it's ok to continue
                                 sem_post(&fDeviceLock);
                         }
@@ -121 +124 @@
         } while(nextopt != -1);
 
-        if (action <= 0)
+        // If we found no valid action request, print usage and exit
+        if (action <= 0 || action == 'h')
         {
                 usage(argv[0]);
-                exit(action);
+                // Exit code is EXIT_SUCCESS if we reach this by -h option. Otherwise
+                // the arguments are incorrect
+                exit(action < 0 ? action : 0);
         }
 
-        // TODO take action depending on command request in CLI
         // TODO handle the boring usb stuff... (might be nice to abstract it so we
         // can use both libusb and haiku usb kit)
@@ -140 +145 @@
 
         int deviceAvailable;
+        // TODO we rely on the initial device scan being done when we get here. Is
+        // that always true ? If not, we may print this message in cases where it
+        // is not needed.
         sem_getvalue(&deviceLock, &deviceAvailable);
         if(deviceAvailable == 0)
         {
-                std::cout << "Programmer not connected. Waiting for it..." << std::endl;
+                std::cout << "Programmer hardware not detected. Please connect it now..." << std::endl;
         }
 
+        // Wait for the device
         sem_wait(&deviceLock);
 
-        // Here, perform the programming cycle !
+        ICSP icsp(*theDevice);
+
+        // take action depending on command request in CLI
         switch(action)
         {
                 case 'r':
+                        // read the chip
+                        icsp.Read(filename);
+                        break;
                 case 'w':
+                        icsp.Write(filename);
+                        // Here, perform the programming cycle !
+                        break;
                 case 'e':
-                        ;
+                        icsp.Erase();
+                        // erase the chip
+                        break;
         }
+
+        exit(0);
 }

V-USB_Dev/firmwares/herePic/main.c

@@ -1 @@
-/* HEREPIC - AVR-based ICSP programmer for microchip PIC16F6xx and 16F8xx devices
- * Copyright 2012, Adrien Destugues <pulkomandy@pulkomandy.tk>
- *
- * This file is distributed under the terms of the MIT licence.
- */
 
 /* This project is targetted at the VUSBDev hacking board. */
@@ -17 +12 @@
 
 #include "usbdrv/usbdrv.h"
+#include "shared.h"
 
 // IO pins:
@@ -39 +35 @@
 // Timers may make it easier to do that in parallel with the USB handling, since
 // timings are in the nanosecond range.
-
-
-// ICSP commands are 6-bit wide, for most of them (but not all) the 2 MSb are
-// ignored.
-// We also use these as USB commands for now, but we may do otherwise, since
-// transferring only 14 data bytes in an USB frame is quite a bit of waste.
-// We need some custom commands on USB side as well, to reset the PIC and such
-// things.
-typedef enum
-{
-        // HOST to DEVICE
-        LoadConfigWord          =   0b0000,
-        LoadCodeWord            =   0b0010,
-        LoadDataWord            =   0b0011,
-
-        // Configuration
-        NextAddress                     =   0b0110,
-        BeginEraseProgram       = 0b001000,
-        BeginProgramOnly        = 0b011000,
-        BulkEraseCode           =   0b1001,
-        BulkEraseData           =   0b1011,
-        BulkEraseConfig1        = 0b000001,
-        BulkEraseConfig2        = 0b000111,
-
-        // DEVICE to HOST
-        ReadCodeWord            =   0b0100,
-        ReadDataWord            =   0b0101,
-} ICSPCommands;