X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjtag%2Fdrivers%2Fosbdm.c;h=5c43d32445115914f1a63edce78f5d40790529ec;hb=9dd39a33e6dbd9d95b5bcfde4b41c498841a27a1;hp=d1eeedb3377564907d9d04664d2cd00c32b268c0;hpb=7568a91c8e2398a113f0b40a2a24a1b91ed12c95;p=fw%2Fopenocd

diff --git a/src/jtag/drivers/osbdm.c b/src/jtag/drivers/osbdm.c
index d1eeedb33..5c43d3244 100644
--- a/src/jtag/drivers/osbdm.c
+++ b/src/jtag/drivers/osbdm.c
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
@@ -25,7 +23,7 @@
 #include <helper/binarybuffer.h>
 #include <helper/command.h>
 #include <jtag/interface.h>
-#include "libusb_common.h"
+#include "libusb_helper.h"
 
 struct sequence {
 	int len;
@@ -134,7 +132,7 @@ static const uint16_t osbdm_vid[] = { 0x15a2, 0x15a2, 0x15a2, 0 };
 static const uint16_t osbdm_pid[] = { 0x0042, 0x0058, 0x005e, 0 };
 
 struct osbdm {
-	struct jtag_libusb_device_handle *devh; /* USB handle */
+	struct libusb_device_handle *devh; /* USB handle */
 	uint8_t buffer[OSBDM_USB_BUFSIZE]; /* Data to send and receive */
 	int count; /* Count data to send and to read */
 };
@@ -146,10 +144,12 @@ static struct osbdm osbdm_context;
 static int osbdm_send_and_recv(struct osbdm *osbdm)
 {
 	/* Send request */
-	int count = jtag_libusb_bulk_write(osbdm->devh, OSBDM_USB_EP_WRITE,
-		(char *)osbdm->buffer, osbdm->count, OSBDM_USB_TIMEOUT);
+	int count, ret;
 
-	if (count != osbdm->count) {
+	ret = jtag_libusb_bulk_write(osbdm->devh, OSBDM_USB_EP_WRITE,
+				     (char *)osbdm->buffer, osbdm->count,
+				     OSBDM_USB_TIMEOUT, &count);
+	if (ret || count != osbdm->count) {
 		LOG_ERROR("OSBDM communication error: can't write");
 		return ERROR_FAIL;
 	}
@@ -158,13 +158,12 @@ static int osbdm_send_and_recv(struct osbdm *osbdm)
 	uint8_t cmd_saved = osbdm->buffer[0];
 
 	/* Reading answer */
-	osbdm->count = jtag_libusb_bulk_read(osbdm->devh, OSBDM_USB_EP_READ,
-		(char *)osbdm->buffer, OSBDM_USB_BUFSIZE, OSBDM_USB_TIMEOUT);
-
+	ret = jtag_libusb_bulk_read(osbdm->devh, OSBDM_USB_EP_READ,
+				    (char *)osbdm->buffer, OSBDM_USB_BUFSIZE,
+				    OSBDM_USB_TIMEOUT, &osbdm->count);
 	/* Now perform basic checks for data sent by BDM device
 	 */
-
-	if (osbdm->count < 0) {
+	if (ret) {
 		LOG_ERROR("OSBDM communication error: can't read");
 		return ERROR_FAIL;
 	}
@@ -275,7 +274,7 @@ static int osbdm_swap(struct osbdm *osbdm, void *tms, void *tdi,
 		return ERROR_FAIL;
 	}
 
-	/* Copy TDO responce
+	/* Copy TDO response
 	 */
 	uint8_t *buffer = osbdm->buffer + 4;
 	for (int bit_idx = 0; bit_idx < length; ) {
@@ -298,7 +297,7 @@ static int osbdm_swap(struct osbdm *osbdm, void *tms, void *tdi,
 	return ERROR_OK;
 }
 
-static int osbdm_flush(struct osbdm *osbdm, struct queue* queue)
+static int osbdm_flush(struct osbdm *osbdm, struct queue *queue)
 {
 	uint8_t tms[DIV_ROUND_UP(OSBDM_SWAP_MAX, 8)];
 	uint8_t tdi[DIV_ROUND_UP(OSBDM_SWAP_MAX, 8)];
@@ -375,10 +374,10 @@ static int osbdm_flush(struct osbdm *osbdm, struct queue* queue)
 static int osbdm_open(struct osbdm *osbdm)
 {
 	(void)memset(osbdm, 0, sizeof(*osbdm));
-	if (jtag_libusb_open(osbdm_vid, osbdm_pid, NULL, &osbdm->devh) != ERROR_OK)
+	if (jtag_libusb_open(osbdm_vid, osbdm_pid, NULL, &osbdm->devh, NULL) != ERROR_OK)
 		return ERROR_FAIL;
 
-	if (jtag_libusb_claim_interface(osbdm->devh, 0) != ERROR_OK)
+	if (libusb_claim_interface(osbdm->devh, 0) != ERROR_OK)
 		return ERROR_FAIL;
 
 	return ERROR_OK;
@@ -690,12 +689,16 @@ static int osbdm_init(void)
 	return ERROR_OK;
 }
 
-struct jtag_interface osbdm_interface = {
-	.name = "osbdm",
+static struct jtag_interface osbdm_interface = {
+	.execute_queue = osbdm_execute_queue,
+};
 
+struct adapter_driver osbdm_adapter_driver = {
+	.name = "osbdm",
 	.transports = jtag_only,
-	.execute_queue = osbdm_execute_queue,
 
 	.init = osbdm_init,
-	.quit = osbdm_quit
+	.quit = osbdm_quit,
+
+	.jtag_ops = &osbdm_interface,
 };