diff options
author | taeyoung <ty317.kim@samsung.com> | 2016-09-23 22:06:13 +0900 |
---|---|---|
committer | taeyoung <ty317.kim@samsung.com> | 2016-09-23 22:13:44 +0900 |
commit | 4c454aa061713b307ea36e07dbef95ee0a069e14 (patch) | |
tree | 5a904301c2aea70ee864d0ec2f779e3b173ec7dd | |
parent | f28463f3d87d0cbcf9a66647f455283c0d045a69 (diff) | |
parent | 175e5d7fcc47a6f7f480265edfff89e4ea1c6442 (diff) | |
download | libusbg-accepted/tizen_3.0.m2_mobile.tar.gz libusbg-accepted/tizen_3.0.m2_mobile.tar.bz2 libusbg-accepted/tizen_3.0.m2_mobile.zip |
Merge tag 'upstream/0.1.0' into tizensubmit/tizen_unified/20170308.100414submit/tizen_3.0_wearable/20161015.000004submit/tizen_3.0_tv/20161015.000003submit/tizen_3.0_mobile/20161015.000004submit/tizen_3.0_ivi/20161010.000004submit/tizen_3.0_common/20161104.104000submit/tizen_3.0.m2/20170104.093753submit/tizen/20160923.132155accepted/tizen/wearable/20160927.020616accepted/tizen/unified/20170309.035941accepted/tizen/tv/20160927.020601accepted/tizen/mobile/20160927.020620accepted/tizen/ivi/20160927.020623accepted/tizen/common/20160923.161301accepted/tizen/3.0/wearable/20161015.083513accepted/tizen/3.0/tv/20161016.004828accepted/tizen/3.0/mobile/20161015.033614accepted/tizen/3.0/ivi/20161011.050501accepted/tizen/3.0/common/20161114.111051accepted/tizen/3.0.m2/wearable/20170105.024959accepted/tizen/3.0.m2/tv/20170105.024830accepted/tizen/3.0.m2/mobile/20170105.024644tizen_backup_before_libusbg_to_libusbgx_changetizen_3.0_tvtizen_3.0.m2tizen_3.0accepted/tizen_wearableaccepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_iviaccepted/tizen_commonaccepted/tizen_3.0_wearableaccepted/tizen_3.0_tvaccepted/tizen_3.0_mobileaccepted/tizen_3.0_iviaccepted/tizen_3.0_commonaccepted/tizen_3.0.m2_wearableaccepted/tizen_3.0.m2_tvaccepted/tizen_3.0.m2_mobile
Change-Id: I4965ba341147d86880fb2aac49b196290f1465ec
Signed-off-by: taeyoung <ty317.kim@samsung.com>
-rw-r--r-- | .gbs.conf | 2 | ||||
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | INSTALL | 2 | ||||
-rw-r--r-- | README | 4 | ||||
-rw-r--r-- | include/usbg/usbg.h | 6 | ||||
-rw-r--r-- | tests/test.c | 2 | ||||
-rwxr-xr-x | tests/test.sh | 2 |
7 files changed, 11 insertions, 14 deletions
@@ -1,3 +1,3 @@ [general] upstream_branch = upstream -upstream_tag = v${upstreamversion} +upstream_tag = upstream/${upstreamversion} @@ -1,5 +1,2 @@ -Mon, 20 Jan 2014 Matt Porter <mporter@linaro.org> 0.1.0 -- Rename from libgadget->libusbg -- Update examples to use standard configfs mount point -Wed, 04 Sep 2013 Matt Porter <mporter@linaro.org> 0.0.1 -- Initial release +Tue, 22 Dec 2015 Krzysztof Opasiak <k.opasiak@samsung.com> 0.0.1 + - Initial fork from libusbg @@ -1,4 +1,4 @@ -Installing libusbg: +Installing libusbgx: $ autoreconf -i $ ./configure @@ -1,7 +1,7 @@ -libusbg +libusbg-neXt (libusbgx) ------- -libusbg is a C library encapsulating the kernel USB gadget-configfs +libusbgx is a C library encapsulating the kernel USB gadget-configfs userspace API functionality. It provides routines for creating and parsing USB gadget devices using diff --git a/include/usbg/usbg.h b/include/usbg/usbg.h index 374101e..bcf221d 100644 --- a/include/usbg/usbg.h +++ b/include/usbg/usbg.h @@ -35,7 +35,7 @@ extern "C" { */ /** - * @addtogroup libusbg + * @addtogroup libusbgx * Public API for USB gadget-configfs library * @{ */ @@ -354,7 +354,7 @@ extern const char *usbg_strerror(usbg_error e); /* Library init and cleanup */ /** - * @brief Initialize the libusbg library state + * @brief Initialize the libusbgx library state * @param configfs_path Path to the mounted configfs filesystem * @param state Pointer to be filled with pointer to usbg_state * @return 0 on success, usbg_error on error @@ -362,7 +362,7 @@ extern const char *usbg_strerror(usbg_error e); extern int usbg_init(const char *configfs_path, usbg_state **state); /** - * @brief Clean up the libusbg library state + * @brief Clean up the libusbgx library state * @param s Pointer to state */ extern void usbg_cleanup(usbg_state *s); diff --git a/tests/test.c b/tests/test.c index 708e257..bd17af9 100644 --- a/tests/test.c +++ b/tests/test.c @@ -2628,7 +2628,7 @@ static int apply_test_config(FILE *input) static void print_help() { fprintf(stderr, - "libusbg test suit:\n" + "libusbgx test suit:\n" " --generate-config - generates config to stdout and exit\n" " --use-config - runs test suit using config from stdin\n" " -h --help - print this message\n" diff --git a/tests/test.sh b/tests/test.sh index f4705ee..45b8e3e 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -14,7 +14,7 @@ then fi function usage { - echo "libusbg test suit" + echo "libusbgx test suit" echo "Usage: ./test.sh [option]" echo "Options:" echo " --generate-config filename - generates config to given file and exit" |