summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gpib.c42
1 files changed, 18 insertions, 24 deletions
diff --git a/gpib.c b/gpib.c
index 8d02267..1606eea 100644
--- a/gpib.c
+++ b/gpib.c
@@ -416,34 +416,29 @@ void GPIB_initialize(void)
{
int i;
- for(i=0; i<5; ++i) {
- MR_4882_status[i]=0; /* do this because these variable are 2-byte integers */
- }
- /* but Nat Inst code assumes they are one-byte */
-
- INTERFACE_STATUS=0; /* Initialize Globals to zero */
+ INTERFACE_STATUS=0; /* Initialize Globals to zero */
INTERFACE_ERROR=0;
DATA_COUNT=0;
Requested_Count=0;
- TNT_Out(R_cmdr,F_softreset); /* Reset FIFOS */
+ TNT_Out(R_cmdr,F_softreset); /* Reset FIFOS */
- TNT_Out(R_spmr ,0x80); /* This sequence of commands */
- TNT_Out(R_auxmr,0x80); /* insures that the TNT */
- TNT_Out(R_auxmr,0x99); /* will be in the normal 7210 */
- TNT_Out(R_keyrg,0); /* mode and not 9914 */
+ TNT_Out(R_spmr ,0x80); /* This sequence of commands */
+ TNT_Out(R_auxmr,0x80); /* insures that the TNT */
+ TNT_Out(R_auxmr,0x99); /* will be in the normal 7210 */
+ TNT_Out(R_keyrg,0); /* mode and not 9914 */
- TNT_Out(R_hssel,F_onechip); /* Set TNT to one chip WINK mode */
- TNT_Out(R_misc,0); /* Disable HS mode */
- TNT_Out(R_hier,B_dga|B_dgb); /* Set deglitching circuits to */
+ TNT_Out(R_hssel,F_onechip); /* Set TNT to one chip WINK mode */
+ TNT_Out(R_misc,0); /* Disable HS mode */
+ TNT_Out(R_hier,B_dga|B_dgb); /* Set deglitching circuits to */
- TNT_Out(R_auxmr,F_chrst); /* Reset TNT */
+ TNT_Out(R_auxmr,F_chrst); /* Reset TNT */
- TNT_4882_Status(STB,0xff,CLEAR); /* Initialize Serial Poll Byte */
- TNT_4882_Status(SRE,0xff,CLEAR); /* Initialize SRE memory register */
- TNT_4882_Status(ESR,0xff,CLEAR); /* Initialize ESR memory register */
- TNT_4882_Status(ESR,0x80,SET); /* Indicate power on */
- TNT_4882_Status(ESE,0xff,CLEAR); /* Initialize ESE memory register */
+ TNT_4882_Status(STB,0xff,CLEAR); /* Initialize Serial Poll Byte */
+ TNT_4882_Status(SRE,0xff,CLEAR); /* Initialize SRE memory register */
+ TNT_4882_Status(ESR,0xff,CLEAR); /* Initialize ESR memory register */
+ TNT_4882_Status(ESR,0x80,SET); /* Indicate power on */
+ TNT_4882_Status(ESE,0xff,CLEAR); /* Initialize ESE memory register */
TNT_Adr_Mode();
GPIB_change_address(globals.Flash.gpib_address);
@@ -454,10 +449,9 @@ void GPIB_initialize(void)
/* If not using HS488 set only hst1*/
TNT_Out(R_auxmr,HR_auxrb|((USE_HIGH_SPEED_T1)? B_hst1 : 0));
- TNT_Out(R_auxmr,F_hldi); /* Issue hold off immediately */
- TNT_Out(R_auxmr,F_pon); /* Clear Power On */
-
- TNT_Out(R_imr0,B_glint); /* Enable setting of tlcint */
+ TNT_Out(R_auxmr,F_hldi); /* Issue hold off immediately */
+ TNT_Out(R_auxmr,F_pon); /* Clear Power On */
+ TNT_Out(R_imr0,B_glint); /* Enable setting of tlcint */
}