Fixed capacity issues; goodfet.maxusbmass now enumerates a 2MB disk.

[goodfet] / client / goodfet.maxusbmass

diff --git a/client/goodfet.maxusbmass b/client/goodfet.maxusbmass
index c644827..ea7769a 100755 (executable)
--- a/client/goodfet.maxusbmass
+++ b/client/goodfet.maxusbmass
@@ -168,14 +168,9 @@ class GoodFETMAXUSBMass(GoodFETMAXUSBDevice):
     
     def do_IN3(self):
         """Handle IN3 input event."""
-        #Don't bother clearing interrupt flag, that's done by sending the reply.
-        print "Got an input event, no idea what to do about it.";
-        #This would be for FTDI emulation.  Not for Mass Storage.
-        #self.wreg(rEP3INFIFO,0x01);      #Modem 
-        #self.wreg(rEP3INFIFO,0x00);      #Line 
-        #self.wreg(rEP3INFIFO,0x00);
-        #self.wregAS(rEP3INBC,0);
-        
+        # Do nothing here, as it'll be taken care of elsewhere.  The
+        # interrupt just means that the buffer is empty, not that we
+        # are expected to fill it.
         
     def do_OUT1(self):
         """Handle an OUT1 output event."""
@@ -183,6 +178,7 @@ class GoodFETMAXUSBMass(GoodFETMAXUSBDevice):
         l=self.rreg(rEP1OUTBC);
         frame=self.readbytes(rEP1OUTFIFO,l);
         self.handleCBW(frame);
+        
     lastCBW="";
     def handleCBW(self,cbw):
         """Handles an incoming Command Block Wrapper.  See USB Mass
@@ -212,28 +208,18 @@ class GoodFETMAXUSBMass(GoodFETMAXUSBDevice):
         verb=ord(cb[0]);
         status=00; #good, set to 1 for bad.
         if verb==0x00: # Test Unit Ready
-            response=[0,0,0,0,0,0];
-            self.writebytes(rEP3INFIFO,
-                       response);
-            self.wreg(rEP3INBC,len(response));
-            while not(self.rreg(rEPIRQ)&bmIN3BAVIRQ):
-                #Wait for the packet to complete before sending the next.
-                print "Waiting to complete inquiry."
-                pass;
+            # Send nothing, just the success code.
+            status=0;
         elif verb==0x03: # Request Sense
             print "Responding to Request Sense.  Needed for Macs.";
             response=[0x70, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x0A,
                       0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
                       0x00, 0x00,
                       0,0,0,0,0];
-            status=1;
+            #status=1;
             self.writebytes(rEP3INFIFO,
                             response);
             self.wreg(rEP3INBC,len(response));
-            #while not(self.rreg(rEPIRQ)&bmIN3BAVIRQ):
-            #    #Wait for the packet to complete before sending the next.
-            #    print "Waiting to complete inquiry."
-            #    pass;
         elif verb==0x12: #Inquiry
             #print "Responding to CB inquiry.";
             response=[
@@ -265,14 +251,48 @@ class GoodFETMAXUSBMass(GoodFETMAXUSBDevice):
             #    #Wait for the packet to complete before sending the next.
             #    print "Waiting to complete inquiry."
             #    pass;
+        elif verb==0x1e: #Prevent/Allow Removal
+            # Give a good status to pretend we understand.
+            status=0x00;
+        elif verb==0x1A: #Mode Sense (6)
+            # I should probably send six bytes here.
+            response=[0x12,0,0,0, 0,0,0,0x1C];
+            self.writebytes(rEP3INFIFO,
+                            response);
+            self.wregAS(rEP3INBC,
+                        len(response));
+        elif verb==0x23: #Read Format Capacity
+            response=[
+                0x00, 0,0x00,0x08, #Capacity list length.
+                0,0x00,x10,0x00,   # Number of sectors, implying 10MB.
+                0x01,0x00,            #reserved/desciptor code.
+                0x02,0x00             # 512 bytes/sector.  Why is this twice?
+                ];
+            self.writebytes(rEP3INFIFO,
+                            response);
+            self.wregAS(rEP3INBC,
+                        len(response));
+        elif verb==0x25: #Read Capacity
+            response=[
+                0x00, 0,0x0f,0xFF, # Last LBA; might have endianness backward.
+                0x00,0x00,0x02,0x00   # Block length of 512 bytes.
+                ];
+            self.writebytes(rEP3INFIFO,
+                            response);
+            self.wregAS(rEP3INBC,
+                        len(response));
+        elif verb==0x28: #READ SECTOR
+            print "Haven't implemented READ SECTOR.";
+            sys.exit();
+        elif verb==0x2A: #WRITE SECTOR
+            print "Haven't implemented WRITE SECTOR.";
+            sys.exit();
         else:
-            print "ERROR: Unknown command block verb %02x." % verb;
+            print "ERROR: Unknown SCSI command block verb %02x." % verb;
             status=1; #Command Failed
             if dtlen>0:
-                print "Exiting, as %i bytes are expected to be transfered toward %i." % (
-                    dtlen,dtdir);
-                    
-                sys.exit();
+                print "Perhaps I should send %i bytes of dummy data here." % dtlen;
+            sys.exit(1);
         cbw=self.lastCBW;
         
         #Now we need to send the CSW.
@@ -282,7 +302,7 @@ class GoodFETMAXUSBMass(GoodFETMAXUSBDevice):
             #CBW key; must be the same as the one we're replying to.
             ord(cbw[4]),ord(cbw[5]),ord(cbw[6]),ord(cbw[7]),
             #CSW Data Residue, probably oughtn't be zeroed.
-            0,0,0,
+            0,0,0,0,
             #Status byte: 00 for good, 01 for bad.
             status];
         self.writebytes(rEP3INFIFO,
@@ -290,7 +310,6 @@ class GoodFETMAXUSBMass(GoodFETMAXUSBDevice):
         self.wregAS(rEP3INBC,len(csw));
         
         
-        self.wreg(rEPIRQ,bmIN3BAVIRQ); #Clear the IRQ bit.
         return;
 #Initialize FET and set baud rate
 client=GoodFETMAXUSBMass();