diff options
Diffstat (limited to 'servers/gpib_server_lin/src/gpib_functions.cpp')
| -rw-r--r-- | servers/gpib_server_lin/src/gpib_functions.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/servers/gpib_server_lin/src/gpib_functions.cpp b/servers/gpib_server_lin/src/gpib_functions.cpp index 95a28d9..e3e3a38 100644 --- a/servers/gpib_server_lin/src/gpib_functions.cpp +++ b/servers/gpib_server_lin/src/gpib_functions.cpp @@ -32,7 +32,7 @@ char falpha[1024]; -char * scopeLongDescription (const char * scopeType) { +const char * scopeLongDescription (const char * scopeType) { if (strcmp("HP54600OS", scopeType) == 0) { return "Hewlett Packard 54600 series"; } @@ -44,7 +44,7 @@ char * scopeLongDescription (const char * scopeType) { } } -char * commanalyzerLongDescription (const char * commanalyzerType) { +const char * commanalyzerLongDescription (const char * commanalyzerType) { if (strcmp("HP8924C", commanalyzerType) == 0) { return "Hewlett Packard 8924 series"; } @@ -53,7 +53,16 @@ char * commanalyzerLongDescription (const char * commanalyzerType) { } } -char * funcgenLongDescription (const char * funcgenType) { +const char * companalyzerLongDescription (const char * companalyzerType) { + if (strcmp("HP4191A", companalyzerType) == 0) { + return "Hewlett Packard HP4191 series"; + } + else { + return "UNKNOWN"; + } +} + +const char * funcgenLongDescription (const char * funcgenType) { if (strcmp("AG33250A", funcgenType) == 0) { return "Agilent AG33250A"; } @@ -81,7 +90,7 @@ int open_gpib_device(int minor, int pad) { return ud; } -int gpib_write(int ud, char * buffer) { +int gpib_write(int ud, const char * buffer) { if( ibwrt(ud, buffer, strlen(buffer)) & ERR ) { return -1; |