X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fosbdm.c;h=5db36a122ae943089d54656e57f1f8c9ff102da4;hp=385730126d490d18b69879002241f79d079826ee;hb=5be455a710c57bbbbd49c2d671b42098db7be5dc;hpb=94d64ccaebd3df17f5873c076fc08ca97088cb1e

diff --git a/src/jtag/drivers/osbdm.c b/src/jtag/drivers/osbdm.c
index 385730126d..5db36a122a 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"
@@ -107,7 +105,7 @@ static struct queue *queue_alloc(void)
 	return queue;
 }
 
-/* Size of usb communnication buffer */
+/* Size of usb communication buffer */
 #define OSBDM_USB_BUFSIZE 64
 /* Timeout for USB transfer, ms */
 #define OSBDM_USB_TIMEOUT 1000
@@ -150,7 +148,7 @@ static int osbdm_send_and_recv(struct osbdm *osbdm)
 		(char *)osbdm->buffer, osbdm->count, OSBDM_USB_TIMEOUT);
 
 	if (count != osbdm->count) {
-		LOG_ERROR("OSBDM communnication error: can't write");
+		LOG_ERROR("OSBDM communication error: can't write");
 		return ERROR_FAIL;
 	}
 
@@ -165,22 +163,22 @@ static int osbdm_send_and_recv(struct osbdm *osbdm)
 	 */
 
 	if (osbdm->count < 0) {
-		LOG_ERROR("OSBDM communnication error: can't read");
+		LOG_ERROR("OSBDM communication error: can't read");
 		return ERROR_FAIL;
 	}
 
 	if (osbdm->count < 2) {
-		LOG_ERROR("OSBDM communnication error: answer too small");
+		LOG_ERROR("OSBDM communication error: reply too small");
 		return ERROR_FAIL;
 	}
 
 	if (osbdm->count != osbdm->buffer[1])  {
-		LOG_ERROR("OSBDM communnication error: answer size mismatch");
+		LOG_ERROR("OSBDM communication error: reply size mismatch");
 		return ERROR_FAIL;
 	}
 
 	if (cmd_saved != osbdm->buffer[0]) {
-		LOG_ERROR("OSBDM communnication error: answer command mismatch");
+		LOG_ERROR("OSBDM communication error: reply command mismatch");
 		return ERROR_FAIL;
 	}
 
@@ -219,7 +217,7 @@ static int osbdm_swap(struct osbdm *osbdm, void *tms, void *tdi,
 	}
 
 	if (length <= 0) {
-		LOG_ERROR("BUG: bit sequence equal or less to 0");
+		LOG_ERROR("BUG: bit sequence equal or less than 0");
 		return ERROR_FAIL;
 	}
 
@@ -271,7 +269,7 @@ static int osbdm_swap(struct osbdm *osbdm, void *tms, void *tdi,
 	/*	Extra check
 	 */
 	if (((osbdm->buffer[2] << 8) | osbdm->buffer[3]) != 2 * swap_count) {
-		LOG_ERROR("OSBDM communnication error: not proper answer to swap command");
+		LOG_ERROR("OSBDM communication error: invalid swap command reply");
 		return ERROR_FAIL;
 	}
 
@@ -375,7 +373,7 @@ 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, &osbdm->devh) != ERROR_OK)
+	if (jtag_libusb_open(osbdm_vid, osbdm_pid, NULL, &osbdm->devh) != ERROR_OK)
 		return ERROR_FAIL;
 
 	if (jtag_libusb_claim_interface(osbdm->devh, 0) != ERROR_OK)
@@ -678,7 +676,7 @@ static int osbdm_init(void)
 		return ERROR_FAIL;
 	} else {
 		/* Device successfully opened */
-		LOG_INFO("OSBDM has opened");
+		LOG_DEBUG("OSBDM init");
 	}
 
 	/* Perform initialize command */