usbtmc now uses struct scope

[rigol] / scope.c

#include <usb.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <stdint.h>

#include "scope.h"
#include "usbtmc.h"

/* Just USB for now... */
int sendscpi(struct scope* sc, char* cmd, unsigned char *resp, int resplen)
{
	return usbtmc_sendscpi(sc, cmd, resp, resplen);
}

void closescope(struct scope* sc)
{
	return usbtmc_close(sc);
}

void claimscope(struct scope* sc)
{
	return usbtmc_claim(sc);
}

void releasescope(struct scope* sc)
{
	//Disable keylock, so the user doesn't have to press the 'force'-button
	sendscpi(sc, ":KEY:LOCK DISABLE",NULL,0); 
	return usbtmc_release(sc);
}

struct scope* initscope(void)
{
	struct scope *sc;

	sc = usbtmc_initscope();

	if (!sc) {
		printf("No scope found.\n");
		exit(EXIT_FAILURE);
	}

	claimscope(sc);
	sendscpi(sc, "*IDN?", (unsigned char*)sc->idn, sizeof(sc->idn)); 
	releasescope(sc);

	printf("Scope found (%s)\n", sc->idn);

	return sc;
}

char *scope_idn(struct scope *sc)
{
	return sc->idn;
}