On 13.08.21 17:22, Uwe Kleine-König wrote:
> Only one of the two members of struct usb_id is actually used. So
> replace struct usb_id by a struct mach_id.
>
> Signed-off-by: Uwe Kleine-Koenig <u.kleine-koenig@xxxxxxxxxxxxxx>
Tested-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
> ---
> scripts/imx/imx-usb-loader.c | 51 ++++++++++++------------------------
> 1 file changed, 17 insertions(+), 34 deletions(-)
>
> diff --git a/scripts/imx/imx-usb-loader.c b/scripts/imx/imx-usb-loader.c
> index cff77f27f264..3e96c86f2f29 100644
> --- a/scripts/imx/imx-usb-loader.c
> +++ b/scripts/imx/imx-usb-loader.c
> @@ -52,7 +52,7 @@
>
> int verbose;
> static struct libusb_device_handle *usb_dev_handle;
> -static struct usb_id *usb_id;
> +static const struct mach_id *mach_id;
>
> struct mach_id {
> struct mach_id * next;
> @@ -79,11 +79,6 @@ struct usb_work {
> unsigned char plug;
> };
>
> -struct usb_id {
> - const struct mach_id *mach_id;
> - struct usb_work *work;
> -};
> -
> static const struct mach_id imx_ids[] = {
> {
> .vid = 0x066f,
> @@ -507,8 +502,8 @@ static int read_file(const char *name, unsigned char **buffer, unsigned *size)
> static int transfer(int report, unsigned char *p, unsigned cnt, int *last_trans)
> {
> int err;
> - if (cnt > usb_id->mach_id->max_transfer)
> - cnt = usb_id->mach_id->max_transfer;
> + if (cnt > mach_id->max_transfer)
> + cnt = mach_id->max_transfer;
>
> if (verbose > 4) {
> printf("report=%i\n", report);
> @@ -516,7 +511,7 @@ static int transfer(int report, unsigned char *p, unsigned cnt, int *last_trans)
> dump_bytes(p, cnt, 0);
> }
>
> - if (usb_id->mach_id->mode == MODE_BULK) {
> + if (mach_id->mode == MODE_BULK) {
> *last_trans = 0;
> err = libusb_bulk_transfer(usb_dev_handle,
> (report < 3) ? 1 : 2 + EP_IN, p, cnt, last_trans, 1000);
> @@ -602,7 +597,7 @@ static int do_status(void)
> break;
> }
>
> - if (usb_id->mach_id->mode == MODE_HID) {
> + if (mach_id->mode == MODE_HID) {
> err = transfer(4, tmp, sizeof(tmp), &last_trans);
> if (err)
> printf("4 in err=%i, last_trans=%i %02x %02x %02x %02x\n",
> @@ -810,7 +805,7 @@ static int load_file(void *buf, unsigned len, unsigned dladdr,
>
> retry = 0;
>
> - if (usb_id->mach_id->mode == MODE_BULK) {
> + if (mach_id->mode == MODE_BULK) {
> err = transfer(3, tmp, sizeof(tmp), &last_trans);
> if (err)
> printf("in err=%i, last_trans=%i %02x %02x %02x %02x\n",
> @@ -821,7 +816,7 @@ static int load_file(void *buf, unsigned len, unsigned dladdr,
> cnt = len;
>
> while (1) {
> - int now = get_min(cnt, usb_id->mach_id->max_transfer);
> + int now = get_min(cnt, mach_id->max_transfer);
>
> if (!now)
> break;
> @@ -839,7 +834,7 @@ static int load_file(void *buf, unsigned len, unsigned dladdr,
> if (mode_barebox)
> return transfer_size;
>
> - if (usb_id->mach_id->mode == MODE_HID) {
> + if (mach_id->mode == MODE_HID) {
> err = transfer(3, tmp, sizeof(tmp), &last_trans);
> if (err)
> printf("3 in err=%i, last_trans=%i %02x %02x %02x %02x\n",
> @@ -1233,7 +1228,7 @@ static int is_header(const unsigned char *p)
> const struct imx_flash_header_v2 *hdr =
> (const struct imx_flash_header_v2 *)p;
>
> - switch (usb_id->mach_id->header_type) {
> + switch (mach_id->header_type) {
> case HDR_MX51:
> if (ohdr->app_code_barker == 0xb1)
> return 1;
> @@ -1253,7 +1248,7 @@ static int perform_dcd(unsigned char *p, const unsigned char *file_start,
> struct imx_flash_header_v2 *hdr = (struct imx_flash_header_v2 *)p;
> int ret = 0;
>
> - switch (usb_id->mach_id->header_type) {
> + switch (mach_id->header_type) {
> case HDR_MX51:
> ret = write_dcd_table_old(ohdr, file_start, cnt);
> ohdr->dcd_block_len = 0;
> @@ -1274,7 +1269,7 @@ static int get_dl_start(const unsigned char *p, const unsigned char *file_start,
> unsigned *header_addr)
> {
> const unsigned char *file_end = file_start + cnt;
> - switch (usb_id->mach_id->header_type) {
> + switch (mach_id->header_type) {
> case HDR_MX51:
> {
> struct imx_flash_header *ohdr = (struct imx_flash_header *)p;
> @@ -1315,7 +1310,7 @@ static int get_payload_start(const unsigned char *p, uint32_t *ofs)
> {
> struct imx_flash_header_v2 *hdr = (struct imx_flash_header_v2 *)p;
>
> - switch (usb_id->mach_id->header_type) {
> + switch (mach_id->header_type) {
> case HDR_MX51:
> return -EINVAL;
>
> @@ -1430,7 +1425,7 @@ static int do_irom_download(struct usb_work *curr, int verify)
>
> memcpy(verify_buffer, image, 64);
>
> - if ((type == FT_APP) && (usb_id->mach_id->mode != MODE_HID)) {
> + if ((type == FT_APP) && (mach_id->mode != MODE_HID)) {
> type = FT_LOAD_ONLY;
> verify = 2;
> }
> @@ -1469,7 +1464,7 @@ static int do_irom_download(struct usb_work *curr, int verify)
> }
> }
>
> - if (usb_id->mach_id->mode == MODE_HID && type == FT_APP) {
> + if (mach_id->mode == MODE_HID && type == FT_APP) {
> printf("jumping to 0x%08x\n", header_addr);
>
> ret = sdp_jump_address(header_addr);
> @@ -1532,7 +1527,7 @@ static int mxs_load_file(libusb_device_handle *dev, uint8_t *data, int size)
> cnt = size;
>
> while (1) {
> - int now = get_min(cnt, usb_id->mach_id->max_transfer);
> + int now = get_min(cnt, mach_id->max_transfer);
>
> if (!now)
> break;
> @@ -1591,7 +1586,6 @@ static void usage(const char *prgname)
>
> int main(int argc, char *argv[])
> {
> - const struct mach_id *mach;
> libusb_device **devs;
> libusb_device *dev;
> int r;
> @@ -1663,7 +1657,7 @@ int main(int argc, char *argv[])
> goto out;
> }
>
> - dev = find_imx_dev(devs, &mach, devpath, devtype);
> + dev = find_imx_dev(devs, &mach_id, devpath, devtype);
> if (!dev) {
> fprintf(stderr, "no supported device found\n");
> goto out;
> @@ -1682,15 +1676,7 @@ int main(int argc, char *argv[])
> goto out;
> }
>
> - usb_id = malloc(sizeof(*usb_id));
> - if (!usb_id) {
> - perror("malloc");
> - exit(1);
> - }
> -
> - usb_id->mach_id = mach;
> -
> - if (mach->dev_type == DEV_MXS) {
> + if (mach_id->dev_type == DEV_MXS) {
> ret = mxs_work(&w);
> goto out;
> }
> @@ -1715,9 +1701,6 @@ int main(int argc, char *argv[])
>
> ret = 0;
> out:
> - if (usb_id)
> - free(usb_id);
> -
> if (usb_dev_handle)
> libusb_close(usb_dev_handle);
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
