abstract the hardware identification checks

1 files changed, 10 insertions, 10 deletions

diff --git a/gpib.c b/gpib.c
index 4eeaa9b..53c6706 100644
--- a/gpib.c
+++ b/gpib.c
@@ -261,7 +261,7 @@ void TNT_4882_Status(int status_register,unsigned int byte,int operation)
 {
 	int set_srq;
 
-	if (globals.HWDetect.gpib) {
+	if (globals.HWDetect.has_gpib) {
 		MR_4882_status[STB] = TNT_In(R_spsr);		// Get STB
 	}
 
@@ -419,9 +419,9 @@ void GPIB_initialize(void)
 	Requested_Count=0;
 
 	// test to detect TNT chip
-	globals.HWDetect.gpib = 1;
+	globals.HWDetect.has_gpib = 1;
 	if ((TNT_In(R_sts2) & 0xB0) != 0x90) {
-		globals.HWDetect.gpib = 0;
+		globals.HWDetect.has_gpib = 0;
 		printf ("Error: TNT4882 chip not found\n");
 		return;
 	}
@@ -472,7 +472,7 @@ static void TNT_Adr_Mode()
 
 void GPIB_change_address(int new_address)
 {
-	if (!globals.HWDetect.gpib) {
+	if (!globals.HWDetect.has_gpib) {
 		return;
 	}
 
@@ -589,7 +589,7 @@ static unsigned long int TNT_DATA_COUNT()
 
 static void TNT_Out(int reg, unsigned int byte)
 {
-	if (!globals.HWDetect.gpib) {
+	if (!globals.HWDetect.has_gpib) {
 		return;
 	}
 
@@ -599,7 +599,7 @@ static void TNT_Out(int reg, unsigned int byte)
 
 static unsigned char TNT_In(int reg)
 {
-	if (!globals.HWDetect.gpib) {
+	if (!globals.HWDetect.has_gpib) {
 		return (unsigned char) 0;
 	}
 
@@ -641,7 +641,7 @@ int GPIB_check_for_device_clear_signal(void)
 {
 	/* reset interface if a device clear is received */
 
-	if (!globals.HWDetect.gpib) {
+	if (!globals.HWDetect.has_gpib) {
 		return FALSE;
 	}
 
@@ -671,7 +671,7 @@ int GPIB_check_for_messages(char *gpib_buf)
 {
 #define ib_empty  (!(strlen(gpib_buf)))
 
-	if (!globals.HWDetect.gpib) {
+	if (!globals.HWDetect.has_gpib) {
 		return FALSE;
 	}
 
@@ -709,7 +709,7 @@ int GPIB_check_for_messages(char *gpib_buf)
 
 int GPIB_handle_new_input(char *gpib_buf)
 {
-	if (!globals.HWDetect.gpib) {
+	if (!globals.HWDetect.has_gpib) {
 		return FALSE;
 	}
 
@@ -932,7 +932,7 @@ void GPIB_finish_query_response()
 void GPIB_check_remote_status (int *is_remote, int *is_lockout)
 {
 	*is_remote = *is_lockout = 0;
-	if (!globals.HWDetect.gpib) {
+	if (!globals.HWDetect.has_gpib) {
 		return;
 	}