summaryrefslogtreecommitdiff
path: root/globals.h
diff options
context:
space:
mode:
Diffstat (limited to 'globals.h')
-rw-r--r--globals.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/globals.h b/globals.h
index bed0eef..13b6cc9 100644
--- a/globals.h
+++ b/globals.h
@@ -273,18 +273,8 @@
long sec_timer (void);
unsigned long long ms_timer (void);
-typedef struct {
- int PRIMARY_ADDRESS; /* GPIB chip's GPIB primary address */
- int INTERFACE_ERROR; /* Error Code */
- int INTERFACE_STATUS; /* Interface Status */
- unsigned int MR_4882_status[5]; /* 4882 status memory registers */
- unsigned long int DATA_COUNT; /* Transfer count */
- unsigned long int Requested_Count; /* Requested transfer count */
- unsigned long int cnt;
- int prev_brq;
- int spoll_count;
-} GpibStruct;
+#define max_gpib_input_length 512
typedef struct {
int parallel_DAC_reg[8];
@@ -294,6 +284,7 @@ typedef struct {
int ques_enable_register; /* for stat:enable command */
int avrq_reg;
int last_rise_time_relay_setting;
+ char gpib_buffer[max_gpib_input_length];
} HWregStruct;
@@ -795,7 +786,6 @@ typedef struct {
ConstraintsStruct Constraints;
ChannelStruct ChannelState[max_channels];
FlashStruct Flash;
- GpibStruct GPIB;
HWregStruct Registers;
ChangeStruct Changes;
ErrorStruct Errors;