Remove unnecessary casts

[openocd.git] / src / jtag / drivers / osbdm.c

diff --git a/src/jtag/drivers/osbdm.c b/src/jtag/drivers/osbdm.c
index 1875600f34329dc9504aea55ea5c6cc3980904ad..4faaa8432d7c043b3ab3abd0931843e5a240fbfb 100644 (file)
--- a/src/jtag/drivers/osbdm.c
+++ b/src/jtag/drivers/osbdm.c
@@ -15,7 +15,7 @@
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
@@ -48,7 +48,7 @@ static struct sequence *queue_add_tail(struct queue *queue, int len)
        }
 
        struct sequence *next;
-       next = (struct sequence *)malloc(sizeof(*next));
+       next = malloc(sizeof(*next));
        if (next) {
                next->tms = calloc(1, DIV_ROUND_UP(len, 8));
                if (next->tms) {
@@ -98,7 +98,7 @@ static void queue_free(struct queue *queue)
 
 static struct queue *queue_alloc(void)
 {
-       struct queue *queue = (struct queue *)malloc(sizeof(struct queue));
+       struct queue *queue = malloc(sizeof(*queue));
        if (queue)
                queue->head = NULL;
        else
@@ -130,12 +130,12 @@ static struct queue *queue_alloc(void)
 
 /* Lists of valid VID/PID pairs
  */
-static const uint16_t osbdm_vid[] = { 0x15a2, 0x15a2, 0 };
-static const uint16_t osbdm_pid[] = { 0x0042, 0x0058, 0 };
+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 */
-       uint8_t buffer[OSBDM_USB_BUFSIZE]; /* Data to send and recieved */
+       uint8_t buffer[OSBDM_USB_BUFSIZE]; /* Data to send and receive */
        int count; /* Count data to send and to read */
 };
 
@@ -277,7 +277,7 @@ static int osbdm_swap(struct osbdm *osbdm, void *tms, void *tdi,
 
        /* Copy TDO responce
         */
-       uint8_t *buffer = (uint8_t *)osbdm->buffer + 4;
+       uint8_t *buffer = osbdm->buffer + 4;
        for (int bit_idx = 0; bit_idx < length; ) {
                int bit_count = length - bit_idx;
                if (bit_count > 16)
@@ -690,33 +690,12 @@ static int osbdm_init(void)
        return ERROR_OK;
 }
 
-static int osbdm_khz(int khz, int *speed)
-{
-       *speed = khz;
-       return ERROR_OK;
-}
-
-static int osbdm_speed(int speed)
-{
-       return ERROR_OK;
-}
-
-static int osbdm_speed_div(int speed, int *khz)
-{
-       *khz = speed;
-       return ERROR_OK;
-}
-
 struct jtag_interface osbdm_interface = {
        .name = "osbdm",
 
        .transports = jtag_only,
        .execute_queue = osbdm_execute_queue,
 
-       .khz = osbdm_khz,
-       .speed = osbdm_speed,
-       .speed_div = osbdm_speed_div,
-
        .init = osbdm_init,
        .quit = osbdm_quit
 };