Mirror/libusbgx
1
0
Fork 0
mirror of https://github.com/linux-usb-gadgets/libusbgx.git synced 2025-07-13 01:19:44 +03:00
Code Issues Wiki Activity

libusbgx: Keep gadget strs in the same order as in device desc

Browse source 
Let's keep gadget strings in the same order as they appear
in USB device descriptor to avoid mistakes during structure
initialization.

Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
This commit is contained in:
Krzysztof Opasiak 2016-12-14 13:29:41 +01:00
parent 67aaf8ea7e
commit c02dbe391f
5 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/usbg/usbg.h
View file

@ -136,8 +136,8 @@ struct usbg_gadget_attrs
typedef enum {
USBG_GADGET_STR_MIN = 0,
USBG_STR_PRODUCT = USBG_GADGET_STR_MIN,
USBG_STR_MANUFACTURER,
USBG_STR_MANUFACTURER = USBG_GADGET_STR_MIN,
USBG_STR_PRODUCT,
USBG_STR_SERIAL_NUMBER,
USBG_GADGET_STR_MAX,
} usbg_gadget_str;
@ -147,9 +147,9 @@ typedef enum {
*/
struct usbg_gadget_strs
{
char serial[USBG_MAX_STR_LENGTH];
char manufacturer[USBG_MAX_STR_LENGTH];
char product[USBG_MAX_STR_LENGTH];
char serial[USBG_MAX_STR_LENGTH];
};
/**

17
src/usbg.c
View file

@ -89,8 +89,8 @@ ARRAY_SIZE_SENTINEL(gadget_attr_names, USBG_GADGET_ATTR_MAX);
const char *gadget_str_names[] =
{
"product",
"manufacturer",
"product",
"serialnumber",
};
@ -773,10 +773,6 @@ static int usbg_parse_gadget_strs(const char *path, const char *name, int lang,
}
closedir(dir);
ret = usbg_read_string(spath, "", "serialnumber", g_strs->serial);
if (ret != USBG_SUCCESS)
goto out;
ret = usbg_read_string(spath, "", "manufacturer", g_strs->manufacturer);
if (ret != USBG_SUCCESS)
goto out;
@ -785,6 +781,10 @@ static int usbg_parse_gadget_strs(const char *path, const char *name, int lang,
if (ret != USBG_SUCCESS)
goto out;
ret = usbg_read_string(spath, "", "serialnumber", g_strs->serial);
if (ret != USBG_SUCCESS)
goto out;
out:
return ret;
}
@ -1691,16 +1691,15 @@ int usbg_set_gadget_strs(usbg_gadget *g, int lang,
if (ret != USBG_SUCCESS)
goto out;
ret = usbg_write_string(path, "", "serialnumber", g_strs->serial);
if (ret != USBG_SUCCESS)
goto out;
ret = usbg_write_string(path, "", "manufacturer", g_strs->manufacturer);
if (ret != USBG_SUCCESS)
goto out;
ret = usbg_write_string(path, "", "product", g_strs->product);
if (ret != USBG_SUCCESS)
goto out;
ret = usbg_write_string(path, "", "serialnumber", g_strs->serial);
out:
return ret;
}

16
tests/test.c
View file

@ -1439,10 +1439,6 @@ static void test_set_gadget_strs(void **data)
pull_gadget_string(tg, LANG_US_ENG, i,
get_gadget_str(ts->strs, i));
ret = usbg_set_gadget_serial_number(g, LANG_US_ENG,
ts->strs->serial);
assert_int_equal(ret, 0);
ret = usbg_set_gadget_manufacturer(g, LANG_US_ENG,
ts->strs->manufacturer);
assert_int_equal(ret, 0);
@ -1451,15 +1447,15 @@ static void test_set_gadget_strs(void **data)
ts->strs->product);
assert_int_equal(ret, 0);
ret = usbg_set_gadget_serial_number(g, LANG_US_ENG,
ts->strs->serial);
assert_int_equal(ret, 0);
for (i = 0; i < GADGET_STR_MAX; i++)
pull_gadget_string(tg, LANG_US_ENG,
i, get_gadget_str(ts->strs, i));
ret = usbg_set_gadget_str(g, USBG_STR_SERIAL_NUMBER,
LANG_US_ENG, ts->strs->serial);
assert_int_equal(ret, 0);
ret = usbg_set_gadget_str(g, USBG_STR_MANUFACTURER,
LANG_US_ENG, ts->strs->manufacturer);
assert_int_equal(ret, 0);
@ -1467,6 +1463,10 @@ static void test_set_gadget_strs(void **data)
ret = usbg_set_gadget_str(g, USBG_STR_PRODUCT,
LANG_US_ENG, ts->strs->product);
assert_int_equal(ret, 0);
ret = usbg_set_gadget_str(g, USBG_STR_SERIAL_NUMBER,
LANG_US_ENG, ts->strs->serial);
assert_int_equal(ret, 0);
}
}

4
tests/usbg-test.c
View file

@ -18,9 +18,9 @@ static struct simple_stack{
} *cleanup_top = NULL;
static const char *gadget_str_names[] = {
"serialnumber",
"manufacturer",
"product"
"product",
"serialnumber",
};
static const char *config_attr_names[] = {

4
tests/usbg-test.h
View file

@ -71,9 +71,9 @@ struct test_state
};
typedef enum {
STR_SER = 0,
STR_MNF,
STR_MNF = 0,
STR_PRD,
STR_SER,
GADGET_STR_MAX
} gadget_str;