X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/rigol/blobdiff_plain/b131d433f9b984b50266298be6f0cf7f9a13b6fb..713be7a43ed11947c358fc67c11b9df7b0be204c:/rigold.c diff --git a/rigold.c b/rigold.c index 0be124f..974a814 100644 --- a/rigold.c +++ b/rigold.c @@ -5,9 +5,9 @@ #include #include #include -#include +#include -#include "usbtmc.h" +#include "scope.h" #include "commands.h" static int send_binary(int s, char *buf, int len) @@ -32,24 +32,26 @@ static int send_text(int s, char *buf) return send_binary(s, buf, strlen(buf)); } -static void serve_index(int s) +static void serve_index(int s, struct scope *sc) { send_text(s, "HTTP/1.0 200 OK"); send_text(s, "Content-type: text/html\n\n"); - send_text(s, "Rigol DS1000\n"); + send_text(s, ""); + send_text(s, scope_idn(sc)); + send_text(s, "\n"); send_text(s, "\n"); send_text(s, "\n"); } -static void serve_lcd(int s, struct usb_dev_handle *sc) +static void serve_lcd(int s, struct scope *sc) { char buf[256]; int imglen; unsigned char *png; - usbtmc_claim(sc); + claimscope(sc); png = get_lcd(sc, &imglen, 0); - usbtmc_release(sc); + releasescope(sc); if (png == NULL) return; @@ -63,7 +65,7 @@ static void serve_lcd(int s, struct usb_dev_handle *sc) free(png); } -static void parse_request(int s, struct usb_dev_handle *sc) +static void parse_request(int s, struct scope *sc) { int ret; char buf[1024]; @@ -107,7 +109,7 @@ static void parse_request(int s, struct usb_dev_handle *sc) } while(token != NULL); if (strcmp("/", file) == 0) { - serve_index(s); + serve_index(s, sc); } else if (strcmp("/lcd.png", file) == 0) { serve_lcd(s, sc); } @@ -118,11 +120,11 @@ int main(int argc, char **argv) int sock, csock; int opt; socklen_t slen; - struct usb_dev_handle *sc; + struct scope *sc; struct sockaddr_in sin, clientsin; unsigned short port = 8088; - sc = usbtmc_initscope(); + sc = initscope(); if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) { perror("socket"); @@ -161,6 +163,6 @@ int main(int argc, char **argv) close(csock); } - usbtmc_close(sc); + closescope(sc); return 0; }