X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hantek_6022be.c;h=91a959e24439cd7705e21e2f4ad62bf3e8a70d2d;hb=6fcab61f470a44889a919e0bf172c07bb2614d01;hp=07ecc0e1fecd60f7cb53bf53b916c0004ff28f6f;hpb=cc789c14085a371976fa7ef1bc281eb7bac34086;p=sigrok-firmware-fx2lafw.git
diff --git a/hantek_6022be.c b/hantek_6022be.c
index 07ecc0e1..91a959e2 100644
--- a/hantek_6022be.c
+++ b/hantek_6022be.c
@@ -15,8 +15,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * License along with this library; if not, see .
*/
#include
@@ -26,86 +25,16 @@
#include
/* Change to support as many interfaces as you need. */
-BYTE altiface = 0;
+static BYTE altiface = 0;
-volatile WORD ledcounter = 0;
+static volatile WORD ledcounter = 0;
-volatile __bit dosud = FALSE;
-volatile __bit dosuspend = FALSE;
+static volatile __bit dosud = FALSE;
+static volatile __bit dosuspend = FALSE;
extern __code BYTE highspd_dscr;
extern __code BYTE fullspd_dscr;
-extern void main_init();
-
-void main(void)
-{
- /* Save energy. */
- SETCPUFREQ(CLK_12M);
-
- main_init();
-
- /* Set up interrupts. */
- USE_USB_INTS();
-
- ENABLE_SUDAV();
- ENABLE_USBRESET();
- ENABLE_HISPEED();
- ENABLE_SUSPEND();
- ENABLE_RESUME();
-
- /* Global (8051) interrupt enable. */
- EA = 1;
-
- /* Init timer2. */
- RCAP2L = -500 & 0xff;
- RCAP2H = (-500 >> 8) & 0xff;
- T2CON = 0;
- ET2 = 1;
- TR2 = 1;
-
- RENUMERATE();
-
- PORTCCFG = 0;
- PORTACFG = 0;
- OEC = 0xff;
- OEA = 0x80;
-
- while (TRUE) {
- if (dosud) {
- dosud = FALSE;
- handle_setupdata();
- }
-
- if (dosuspend) {
- dosuspend = FALSE;
- do {
- /* Make sure ext wakeups are cleared. */
- WAKEUPCS |= bmWU|bmWU2;
- SUSPEND = 1;
- PCON |= 1;
- __asm
- nop
- nop
- nop
- nop
- nop
- nop
- nop
- __endasm;
- } while (!remote_wakeup_allowed && REMOTE_WAKEUP());
-
- /* Resume (TRM 6.4). */
- if (REMOTE_WAKEUP()) {
- delay(5);
- USBCS |= bmSIGRESUME;
- delay(15);
- USBCS &= ~bmSIGRESUME;
- }
- }
- }
-}
-
void resume_isr(void) __interrupt RESUME_ISR
{
CLEAR_RESUME();
@@ -169,7 +98,7 @@ void timer2_isr(void) __interrupt TF2_ISR
* both channels and then we mask it out to only affect the channel currently
* requested.
*/
-BOOL set_voltage(BYTE channel, BYTE val)
+static BOOL set_voltage(BYTE channel, BYTE val)
{
BYTE bits, mask;
@@ -196,7 +125,7 @@ BOOL set_voltage(BYTE channel, BYTE val)
return TRUE;
}
-BOOL set_numchannels(BYTE numchannels)
+static BOOL set_numchannels(BYTE numchannels)
{
if (numchannels == 1 || numchannels == 2) {
BYTE fifocfg = 7 + numchannels;
@@ -208,7 +137,7 @@ BOOL set_numchannels(BYTE numchannels)
return FALSE;
}
-void clear_fifo(void)
+static void clear_fifo(void)
{
GPIFABORT = 0xff;
SYNCDELAY3;
@@ -221,14 +150,14 @@ void clear_fifo(void)
FIFORESET = 0;
}
-void stop_sampling(void)
+static void stop_sampling(void)
{
GPIFABORT = 0xff;
SYNCDELAY3;
INPKTEND = (altiface == 0) ? 6 : 2;
}
-void start_sampling(void)
+static void start_sampling(void)
{
int i;
@@ -251,10 +180,10 @@ void start_sampling(void)
PC1 = 0;
}
-void select_interface(BYTE alt)
+static void select_interface(BYTE alt)
{
const BYTE *pPacketSize = \
- (USBCS & bmHSM ? &highspd_dscr : &fullspd_dscr)
+ ((USBCS & bmHSM) ? &highspd_dscr : &fullspd_dscr)
+ (9 + (16 * alt) + 9 + 4);
altiface = alt;
@@ -277,7 +206,7 @@ void select_interface(BYTE alt)
}
}
-const struct samplerate_info {
+static const struct samplerate_info {
BYTE rate;
BYTE wait0;
BYTE wait1;
@@ -286,21 +215,21 @@ const struct samplerate_info {
BYTE out0;
BYTE ifcfg;
} samplerates[] = {
- { 48,0x80, 0, 3, 0, 0x00, 0xea },
- { 30,0x80, 0, 3, 0, 0x00, 0xaa },
- { 24, 1, 0, 2, 1, 0x40, 0xca },
- { 16, 1, 1, 2, 0, 0x40, 0xca },
- { 12, 2, 1, 2, 0, 0x40, 0xca },
- { 8, 3, 2, 2, 0, 0x40, 0xca },
- { 4, 6, 5, 2, 0, 0x40, 0xca },
- { 2, 12, 11, 2, 0, 0x40, 0xca },
- { 1, 24, 23, 2, 0, 0x40, 0xca },
- { 50, 48, 47, 2, 0, 0x40, 0xca },
- { 20, 120, 119, 2, 0, 0x40, 0xca },
- { 10, 240, 239, 2, 0, 0x40, 0xca },
+ { 48, 0x80, 0, 3, 0, 0x00, 0xea },
+ { 30, 0x80, 0, 3, 0, 0x00, 0xaa },
+ { 24, 1, 0, 2, 1, 0x40, 0xca },
+ { 16, 1, 1, 2, 0, 0x40, 0xca },
+ { 12, 2, 1, 2, 0, 0x40, 0xca },
+ { 8, 3, 2, 2, 0, 0x40, 0xca },
+ { 4, 6, 5, 2, 0, 0x40, 0xca },
+ { 2, 12, 11, 2, 0, 0x40, 0xca },
+ { 1, 24, 23, 2, 0, 0x40, 0xca },
+ { 50, 48, 47, 2, 0, 0x40, 0xca },
+ { 20, 120, 119, 2, 0, 0x40, 0xca },
+ { 10, 240, 239, 2, 0, 0x40, 0xca },
};
-BOOL set_samplerate(BYTE rate)
+static BOOL set_samplerate(BYTE rate)
{
BYTE i = 0;
@@ -313,7 +242,7 @@ BOOL set_samplerate(BYTE rate)
IFCONFIG = samplerates[i].ifcfg;
AUTOPTRSETUP = 7;
- AUTOPTRH2 = 0xE4;
+ AUTOPTRH2 = 0xE4; /* 0xE400: GPIF waveform descriptor 0. */
AUTOPTRL2 = 0x00;
/*
@@ -330,6 +259,7 @@ BOOL set_samplerate(BYTE rate)
* jump 0, CTL2=Z, FIFO, LOOP
*/
+ /* LENGTH / BRANCH 0-7 */
EXTAUTODAT2 = samplerates[i].wait0;
EXTAUTODAT2 = samplerates[i].wait1;
EXTAUTODAT2 = 1;
@@ -339,24 +269,27 @@ BOOL set_samplerate(BYTE rate)
EXTAUTODAT2 = 0;
EXTAUTODAT2 = 0;
+ /* OPCODE 0-7 */
EXTAUTODAT2 = samplerates[i].opc0;
EXTAUTODAT2 = samplerates[i].opc1;
- EXTAUTODAT2 = 1;
+ EXTAUTODAT2 = 1; /* DATA=0 DP=1 */
EXTAUTODAT2 = 0;
EXTAUTODAT2 = 0;
EXTAUTODAT2 = 0;
EXTAUTODAT2 = 0;
EXTAUTODAT2 = 0;
+ /* OUTPUT 0-7 */
EXTAUTODAT2 = samplerates[i].out0;
- EXTAUTODAT2 = 0x44;
- EXTAUTODAT2 = 0x44;
- EXTAUTODAT2 = 0x00;
- EXTAUTODAT2 = 0x00;
- EXTAUTODAT2 = 0x00;
- EXTAUTODAT2 = 0x00;
- EXTAUTODAT2 = 0x00;
+ EXTAUTODAT2 = 0x44; /* OE2=1, CTL2=1 */
+ EXTAUTODAT2 = 0x44; /* OE2=1, CTL2=1 */
+ EXTAUTODAT2 = 0;
+ EXTAUTODAT2 = 0;
+ EXTAUTODAT2 = 0;
+ EXTAUTODAT2 = 0;
+ EXTAUTODAT2 = 0;
+ /* LOGIC FUNCTION 0-7 */
EXTAUTODAT2 = 0;
EXTAUTODAT2 = 0;
EXTAUTODAT2 = 0;
@@ -419,31 +352,26 @@ BOOL handle_vendorcommand(BYTE cmd)
PC1 = 1;
ledcounter = 1000;
- switch (cmd) {
- case 0xe0:
- case 0xe1:
+ /* Clear EP0BCH/L for each valid command. */
+ if (cmd >= 0xe0 && cmd <= 0xe4) {
EP0BCH = 0;
EP0BCL = 0;
while (EP0CS & bmEPBUSY);
+ }
+
+ switch (cmd) {
+ case 0xe0:
+ case 0xe1:
set_voltage(cmd - 0xe0, EP0BUF[0]);
return TRUE;
case 0xe2:
- EP0BCH = 0;
- EP0BCL = 0;
- while (EP0CS & bmEPBUSY);
set_samplerate(EP0BUF[0]);
return TRUE;
case 0xe3:
- EP0BCH = 0;
- EP0BCL = 0;
- while (EP0CS & bmEPBUSY);
if (EP0BUF[0] == 1)
start_sampling();
return TRUE;
case 0xe4:
- EP0BCH = 0;
- EP0BCL = 0;
- while (EP0CS & bmEPBUSY);
set_numchannels(EP0BUF[0]);
return TRUE;
}
@@ -451,14 +379,14 @@ BOOL handle_vendorcommand(BYTE cmd)
return FALSE; /* Not handled by handlers. */
}
-void main_init(void)
+static void init(void)
{
EP4CFG = 0;
EP8CFG = 0;
/* In idle mode tristate all outputs. */
- GPIFIDLECTL = 0x00;
- GPIFCTLCFG = 0x80;
+ GPIFIDLECTL = 0x00; /* Don't enable CTL0-5 outputs. */
+ GPIFCTLCFG = 0x80; /* TRICTL=1. CTL0-2: CMOS outputs, tri-statable. */
GPIFWFSELECT = 0x00;
GPIFREADYSTAT = 0x00;
@@ -470,3 +398,71 @@ void main_init(void)
set_numchannels(2);
select_interface(0);
}
+
+static void main(void)
+{
+ /* Save energy. */
+ SETCPUFREQ(CLK_12M);
+
+ init();
+
+ /* Set up interrupts. */
+ USE_USB_INTS();
+
+ ENABLE_SUDAV();
+ ENABLE_USBRESET();
+ ENABLE_HISPEED();
+ ENABLE_SUSPEND();
+ ENABLE_RESUME();
+
+ /* Global (8051) interrupt enable. */
+ EA = 1;
+
+ /* Init timer2. */
+ RCAP2L = -500 & 0xff;
+ RCAP2H = (-500 & 0xff00) >> 8;
+ T2CON = 0;
+ ET2 = 1;
+ TR2 = 1;
+
+ RENUMERATE();
+
+ PORTCCFG = 0;
+ PORTACFG = 0;
+ OEC = 0xff;
+ OEA = 0x80;
+
+ while (TRUE) {
+ if (dosud) {
+ dosud = FALSE;
+ handle_setupdata();
+ }
+
+ if (dosuspend) {
+ dosuspend = FALSE;
+ do {
+ /* Make sure ext wakeups are cleared. */
+ WAKEUPCS |= bmWU|bmWU2;
+ SUSPEND = 1;
+ PCON |= 1;
+ __asm
+ nop
+ nop
+ nop
+ nop
+ nop
+ nop
+ nop
+ __endasm;
+ } while (!remote_wakeup_allowed && REMOTE_WAKEUP());
+
+ /* Resume (TRM 6.4). */
+ if (REMOTE_WAKEUP()) {
+ delay(5);
+ USBCS |= bmSIGRESUME;
+ delay(15);
+ USBCS &= ~bmSIGRESUME;
+ }
+ }
+ }
+}