From 5e7e81535fea702b9194795525453ac0b801ce94 Mon Sep 17 00:00:00 2001 From: Tomasz Kramkowski Date: Wed, 23 Nov 2016 21:16:22 +0000 Subject: Got rid of silly xxd mess --- usb/endpt0.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'usb/endpt0.c') diff --git a/usb/endpt0.c b/usb/endpt0.c index a60e1a4..7791d38 100644 --- a/usb/endpt0.c +++ b/usb/endpt0.c @@ -1,3 +1,4 @@ +#include #include #include #include @@ -9,10 +10,7 @@ #include "bdt.h" #include "endpt0.h" -#include "ds_conf.xxh" -#include "ds_dev.xxh" -#include "ds_lang.xxh" -#include "ds_str1.xxh" +#include "descriptors.h" #define MAX_PACKET 64 static unsigned char buf[2][MAX_PACKET]; @@ -142,16 +140,16 @@ static void tok_setup(struct tok_setup *setup) case 0x8006: /* GET DESCRIPTOR */ switch (setup->value) { case 0x0100: /* DEVICE */ - quetx(usb_ds_dev, trunc(usb_ds_dev_len, setup->length)); + quetx(ds_dev, trunc(ARRLEN(ds_dev), setup->length)); return; case 0x0200: /* CONFIGURATION */ - quetx(usb_ds_conf, trunc(usb_ds_conf_len, setup->length)); + quetx(ds_conf, trunc(ARRLEN(ds_conf), setup->length)); return; case 0x0300: /* STRING 0 */ - quetx(usb_ds_lang, trunc(usb_ds_lang_len, setup->length)); + quetx(ds_lang, trunc(ARRLEN(ds_lang), setup->length)); return; case 0x0301: /* STRING 1 */ - quetx(usb_ds_str1, trunc(usb_ds_str1_len, setup->length)); + quetx(ds_str1, trunc(ARRLEN(ds_str1), setup->length)); return; } /* fall through */ -- cgit v1.2.3-54-g00ecf