Minor changes to the Chipcon interface.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@793 12e2690d-a6be-4b82-a7b7-67c4a43b65c8

diff --git a/client/GoodFETCC.py b/client/GoodFETCC.py
index 3be0ca4..474685f 100644 (file)
--- a/client/GoodFETCC.py
+++ b/client/GoodFETCC.py
@@ -134,7 +134,7 @@ class GoodFETCC(GoodFET):
             self.lastshellcode=filename;
             file=__file__;
             file=file.replace("GoodFETCC.pyc","GoodFETCC.py");
             self.lastshellcode=filename;
             file=__file__;
             file=file.replace("GoodFETCC.pyc","GoodFETCC.py");

-            path=file.replace("client/GoodFETCC.py","shellcode/chipcon/cc1110/");
+            path=file.replace("GoodFETCC.py","shellcode/chipcon/cc1110/");

             filename=path+filename;
         
             #Load the shellcode.
             filename=path+filename;
         
             #Load the shellcode.


@@ -275,9 +275,6 @@ class GoodFETCC(GoodFET):
         self.pokebysym("ADDR"     , 0x01)   # Device address.
         self.pokebysym("PKTLEN"   , 0xFF)   # Packet length.
         
         self.pokebysym("ADDR"     , 0x01)   # Device address.
         self.pokebysym("PKTLEN"   , 0xFF)   # Packet length.
         

-        
-        
-        

         self.pokebysym("SYNC1",0xD3);
         self.pokebysym("SYNC0",0x91);
         return;
         self.pokebysym("SYNC1",0xD3);
         self.pokebysym("SYNC0",0x91);
         return;

diff --git a/client/goodfet.cc b/client/goodfet.cc
index 3b3ade4..e431c90 100755 (executable)
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -68,9 +68,9 @@ def handlesimplicitipacket(packet):
                port, 0x21, seq,
                0x81, tid,         #reply, tid
                
                port, 0x21, seq,
                0x81, tid,         #reply, tid
                

-               0x20,0x00,0xad,0xde, #Join token
-               0x00];             #no security
-        printpacket(reply);
+               0x20,0x00,0xad,0xde, #link token
+               0x00];               #no security
+        #printpacket(reply);

         print "#FIXME FAST: repeatedly broadcasting ACK to catch LINK on the next attempt.";
         for foo in range(1,50):
             client.RF_txpacket(reply);
         print "#FIXME FAST: repeatedly broadcasting ACK to catch LINK on the next attempt.";
         for foo in range(1,50):
             client.RF_txpacket(reply);


@@ -78,6 +78,7 @@ def handlesimplicitipacket(packet):
         pass;
     elif port==0x03:
         #print "Join request.";
         pass;
     elif port==0x03:
         #print "Join request.";

+        #printpacket(packet);

         if packet[12]!=1:
             print "Not a join request.  WTF?";
             return;
         if packet[12]!=1:
             print "Not a join request.  WTF?";
             return;


@@ -90,11 +91,12 @@ def handlesimplicitipacket(packet):
                
                0xef,0xbe,0xad,0xde, #Join token
                0x00];             #no security
                
                0xef,0xbe,0xad,0xde, #Join token
                0x00];             #no security

-        printpacket(reply);
+        #printpacket(reply);

         print "#FIXME FAST: repeatedly broadcasting ACK to catch JOIN on the next attempt.";
         print "#FIXME FAST: repeatedly broadcasting ACK to catch JOIN on the next attempt.";

+        #printpacket(reply);

         for foo in range(1,50):
             client.RF_txpacket(reply);
         for foo in range(1,50):
             client.RF_txpacket(reply);

-        #printpacket(reply);
+        

         
     elif port==0x04:
         print "Security request.";
         
     elif port==0x04:
         print "Security request.";

diff --git a/client/shellcode/chipcon/cc1110/crystal.ihx b/client/shellcode/chipcon/cc1110/crystal.ihx
new file mode 100644 (file)
index 0000000..60a2a2d
--- /dev/null
+++ b/client/shellcode/chipcon/cc1110/crystal.ihx
@@ -0,0 +1,21 @@
+:03F0000002F00813
+:03F0610002F003B7
+:05F0030012F06480FE24
+:03F0640053BEFB9D
+:08F06700E5BE30E6FB53C6B81C
+:0AF06F00E5C620E6FB43BE04A5221F
+:06F03700E478FFF6D8FDAD
+:08F015007900E94400601B7A58
+:05F01D000090F07D7879
+:03F02200007593E3
+:0AF0250000E493F2A308B80002050E
+:08F02F0093D9F4DAF27593FFA6
+:08F03D007800E84400600A7944
+:03F04500007593C0
+:06F0480000E4F309D8FC0E
+:08F04E007800E84400600C7931
+:0BF0560000900000E4F0A3D8FCD9FA01
+:03F0080075810708
+:0AF00B0012F079E582600302F003C1
+:04F07900758200227A
+:00000001FF

diff --git a/client/shellcode/chipcon/cc1110/reflex.ihx b/client/shellcode/chipcon/cc1110/reflex.ihx
new file mode 100644 (file)
index 0000000..2c142f9
--- /dev/null
+++ b/client/shellcode/chipcon/cc1110/reflex.ihx
@@ -0,0 +1,36 @@
+:03F0000002F00813
+:03F0610002F003B7
+:05F0030012F08B80FEFD
+:04F06400AA82AB834E
+:05F068001ABAFF011BB4
+:0EF06D00C3E49A74808BF063F08095F0500F2E
+:04F07B007CB07D04E4
+:05F07F001CBCFF011D97
+:06F08400EC4D70F780DE88
+:01F08A002263
+:07F08B0090FE00E0FAC2A8AC
+:03F0920075E10223
+:0EF0950090DF3BE0FBBB0DF87B0090000AC053
+:0AF0A30002C00312F064D003D00293
+:0EF0AD00C3EB9A500F90DF3AE0FC74806CFBCE
+:06F0BB0090FE00F080EC65
+:03F0C10075E104F2
+:0EF0C40090DF3BE0FBBB01F890DF0074AAF088
+:09F0D20090DF0174AAF075E1035E
+:0EF0DB0090DF3BE0FBBB13F890000AC002126E
+:08F0E900F064D002A502F092D0
+:06F03700E478FFF6D8FDAD
+:08F015007900E94400601B7A58
+:05F01D000090F0F57801
+:03F02200007593E3
+:0AF0250000E493F2A308B80002050E
+:08F02F0093D9F4DAF27593FFA6
+:08F03D007800E84400600A7944
+:03F04500007593C0
+:06F0480000E4F309D8FC0E
+:08F04E007800E84400600C7931
+:0BF0560000900000E4F0A3D8FCD9FA01
+:03F0080075810708
+:0AF00B0012F0F1E582600302F00349
+:04F0F1007582002202
+:00000001FF

diff --git a/client/shellcode/chipcon/cc1110/rxpacket.ihx b/client/shellcode/chipcon/cc1110/rxpacket.ihx
new file mode 100644 (file)
index 0000000..9251acd
--- /dev/null
+++ b/client/shellcode/chipcon/cc1110/rxpacket.ihx
@@ -0,0 +1,36 @@
+:03F0000002F00813
+:03F0610002F003B7
+:05F0030012F06480FE24
+:04F064007A107B00A3
+:03F06800BB4000AA
+:0DF06B00500B8B827583FE74FFF00B80F05C
+:05F07800C2A875E104CF
+:0BF07D0090DF3BE0FBBB01F875E102F7
+:0EF0880090DF3BE0FBBB0DF890DF04E0FB30B7
+:04F09600E0387B00E3
+:0EF09A008A047D0074032CFCE43DFD8B067F90
+:0EF0A80000C3EE9CEF64808DF063F08095F065
+:02F0B600503FC9
+:05F0B80010890280FB3D
+:0DF0BD008B040B8C827583FEE5D9FCF0906E
+:06F0CA00FE00E0FA80CA1E
+:0AF0D00090DF02E090FE00F07A01EC
+:0AF0DA0090DF02E0FBC3EA9B501335
+:05F0E40010890280FB11
+:0EF0E9008A030A8B827583FEE5D9FBF080E373
+:05F0F70075E104A522F3
+:06F03700E478FFF6D8FDAD
+:08F015007900E94400601B7A58
+:05F01D000090F10078F5
+:03F02200007593E3
+:0AF0250000E493F2A308B80002050E
+:08F02F0093D9F4DAF27593FFA6
+:08F03D007800E84400600A7944
+:03F04500007593C0
+:06F0480000E4F309D8FC0E
+:08F04E007800E84400600C7931
+:0BF0560000900000E4F0A3D8FCD9FA01
+:03F0080075810708
+:0AF00B0012F0FCE582600302F0033E
+:04F0FC0075820022F7
+:00000001FF

diff --git a/client/shellcode/chipcon/cc1110/txpacket.ihx b/client/shellcode/chipcon/cc1110/txpacket.ihx
new file mode 100644 (file)
index 0000000..94f11b9
--- /dev/null
+++ b/client/shellcode/chipcon/cc1110/txpacket.ihx
@@ -0,0 +1,36 @@
+:03F0000002F00813
+:03F0610002F003B7
+:05F0030012F08B80FEFD
+:04F06400AA82AB834E
+:05F068001ABAFF011BB4
+:0EF06D00C3E49A74808BF063F08095F0500F2E
+:04F07B007CB07D04E4
+:05F07F001CBCFF011D97
+:06F08400EC4D70F780DE88
+:01F08A002263
+:0AF08B0090FE00E0FAC2A875E1044F
+:0BF0950090DF3BE0FBBB01F875E103DE
+:0AF0A00090DF3BE0FBBB13F87B00A0
+:09F0AA008A047D000CBC00010D7C
+:0EF0B3008B067F00C3EE9CEF64808DF063F04F
+:05F0C1008095F0501ADB
+:03F0C6003089FD91
+:0EF0C90090DF3BE0FCBC13F8C2898B040B8C7B
+:09F0D700827583FEE0F5D980CAC0
+:0AF0E00090DF3BE0FABA130280F65D
+:02F0EA00A5225D
+:06F03700E478FFF6D8FDAD
+:08F015007900E94400601B7A58
+:05F01D000090F0F07806
+:03F02200007593E3
+:0AF0250000E493F2A308B80002050E
+:08F02F0093D9F4DAF27593FFA6
+:08F03D007800E84400600A7944
+:03F04500007593C0
+:06F0480000E4F309D8FC0E
+:08F04E007800E84400600C7931
+:0BF0560000900000E4F0A3D8FCD9FA01
+:03F0080075810708
+:0AF00B0012F0ECE582600302F0034E
+:04F0EC007582002207
+:00000001FF

diff --git a/client/shellcode/chipcon/cc1110/txrxpacket.ihx b/client/shellcode/chipcon/cc1110/txrxpacket.ihx
new file mode 100644 (file)
index 0000000..6e6c884
--- /dev/null
+++ b/client/shellcode/chipcon/cc1110/txrxpacket.ihx
@@ -0,0 +1,35 @@
+:03F0000002F00813
+:03F0610002F003B7
+:05F0030012F06480FE24
+:08F0640090FE00E0FA75E104E2
+:0DF06C0090DF3BE0FBBB01F875E1037B008A
+:09F079008A047D000CBC00010DAD
+:0EF082008B067F00EEB50406EFB50502801286
+:05F0900010890280FB65
+:0DF095008B040B8C827583FEE0F5D980D7CB
+:0AF0A20090DF3BE0FBBB130280F699
+:03F0AC0075E10209
+:0CF0AF0090DF3BE0FBBB0DF87A107B000B
+:09F0BB008A047D000CBC00010D6B
+:0EF0C4008B067F00C3EE9CEF64808DF063F03E
+:08F0D2008095F0400302F0FC00
+:05F0DA0010890280FB1B
+:0EF0DF0090DF3BE0FCBC0D118B827583FEE5DB
+:0BF0ED00D9FCF00B90FE00E0FA80C39D
+:04F0F800A502F0BBC2
+:05F0FC0075E104A522EE
+:06F03700E478FFF6D8FDAD
+:08F015007900E94400601B7A58
+:05F01D000090F10578F0
+:03F02200007593E3
+:0AF0250000E493F2A308B80002050E
+:08F02F0093D9F4DAF27593FFA6
+:08F03D007800E84400600A7944
+:03F04500007593C0
+:06F0480000E4F309D8FC0E
+:08F04E007800E84400600C7931
+:0BF0560000900000E4F0A3D8FCD9FA01
+:03F0080075810708
+:0AF00B0012F101E582600302F00338
+:04F1010075820022F1
+:00000001FF