X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fdslogic.c;h=ec8d53427b9536e798ad9503657104070dc1963b;hb=8e2d6c9db788785466d61fdac4d8fdc1535bc20c;hp=6a8af1306b6b0151547865b465dfbb27d1b9b904;hpb=4df5739a9f4272e57d737dc3a957b2f723bbaad1;p=libsigrok.git

diff --git a/src/hardware/fx2lafw/dslogic.c b/src/hardware/fx2lafw/dslogic.c
index 6a8af130..ec8d5342 100644
--- a/src/hardware/fx2lafw/dslogic.c
+++ b/src/hardware/fx2lafw/dslogic.c
@@ -18,10 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
+#include <config.h>
 #include <math.h>
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -34,45 +31,51 @@
 
 #define USB_TIMEOUT (3 * 1000)
 
-int dslogic_fpga_firmware_upload(const struct sr_dev_inst *sdi,
-		const char *filename)
+SR_PRIV int dslogic_fpga_firmware_upload(const struct sr_dev_inst *sdi,
+		const char *name)
 {
-	FILE *fw;
-	struct stat st;
+	uint64_t sum;
+	struct sr_resource bitstream;
+	struct drv_context *drvc;
 	struct sr_usb_dev_inst *usb;
-	int chunksize, result, ret;
 	unsigned char *buf;
-	int sum, transferred;
-
-	sr_dbg("Uploading FPGA firmware at %s.", filename);
+	ssize_t chunksize;
+	int transferred;
+	int result, ret;
+	uint8_t cmd[3];
 
+	drvc = sdi->driver->context;
 	usb = sdi->conn;
-	if (stat(filename, &st) < 0) {
-		sr_err("Unable to upload FPGA firmware: %s", strerror(errno));
-		return SR_ERR;
-	}
+
+	sr_dbg("Uploading FPGA firmware '%s'.", name);
+
+	result = sr_resource_open(drvc->sr_ctx, &bitstream,
+			SR_RESOURCE_FIRMWARE, name);
+	if (result != SR_OK)
+		return result;
 
 	/* Tell the device firmware is coming. */
+	memset(cmd, 0, sizeof(cmd));
 	if ((ret = libusb_control_transfer(usb->devhdl, LIBUSB_REQUEST_TYPE_VENDOR |
 			LIBUSB_ENDPOINT_OUT, DS_CMD_FPGA_FW, 0x0000, 0x0000,
-			NULL, 0, USB_TIMEOUT)) < 0) {
+			(unsigned char *)&cmd, sizeof(cmd), USB_TIMEOUT)) < 0) {
 		sr_err("Failed to upload FPGA firmware: %s.", libusb_error_name(ret));
-		return SR_ERR;
-	}
-	buf = g_malloc(FW_BUFSIZE);
-
-	if (!(fw = g_fopen(filename, "rb"))) {
-		sr_err("Unable to open %s for reading: %s.", filename, strerror(errno));
+		sr_resource_close(drvc->sr_ctx, &bitstream);
 		return SR_ERR;
 	}
 
 	/* Give the FX2 time to get ready for FPGA firmware upload. */
 	g_usleep(FPGA_UPLOAD_DELAY);
 
+	buf = g_malloc(FW_BUFSIZE);
 	sum = 0;
 	result = SR_OK;
 	while (1) {
-		if ((chunksize = fread(buf, 1, FW_BUFSIZE, fw)) == 0)
+		chunksize = sr_resource_read(drvc->sr_ctx, &bitstream,
+				buf, FW_BUFSIZE);
+		if (chunksize < 0)
+			result = SR_ERR;
+		if (chunksize <= 0)
 			break;
 
 		if ((ret = libusb_bulk_transfer(usb->devhdl, 2 | LIBUSB_ENDPOINT_OUT,
@@ -83,7 +86,8 @@ int dslogic_fpga_firmware_upload(const struct sr_dev_inst *sdi,
 			break;
 		}
 		sum += transferred;
-		sr_spew("Uploaded %d/%d bytes.", sum, st.st_size);
+		sr_spew("Uploaded %" PRIu64 "/%" PRIu64 " bytes.",
+			sum, bitstream.size);
 
 		if (transferred != chunksize) {
 			sr_err("Short transfer while uploading FPGA firmware.");
@@ -91,15 +95,16 @@ int dslogic_fpga_firmware_upload(const struct sr_dev_inst *sdi,
 			break;
 		}
 	}
-	fclose(fw);
 	g_free(buf);
+	sr_resource_close(drvc->sr_ctx, &bitstream);
+
 	if (result == SR_OK)
 		sr_dbg("FPGA firmware upload done.");
 
 	return result;
 }
 
-int dslogic_start_acquisition(const struct sr_dev_inst *sdi)
+SR_PRIV int dslogic_start_acquisition(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
@@ -124,7 +129,7 @@ int dslogic_start_acquisition(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-int dslogic_stop_acquisition(const struct sr_dev_inst *sdi)
+SR_PRIV int dslogic_stop_acquisition(const struct sr_dev_inst *sdi)
 {
 	struct sr_usb_dev_inst *usb;
 	struct dslogic_mode mode;
@@ -145,7 +150,7 @@ int dslogic_stop_acquisition(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-int dslogic_fpga_configure(const struct sr_dev_inst *sdi)
+SR_PRIV int dslogic_fpga_configure(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;