Merge pull request #3 from dberliner/xaptum

Rename SCM to HSS
xaptum · Jun 29, 2020 · f55becd · f55becd
2 parents 7b92304 + be9d1de
commit f55becd
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 28 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -14,6 +14,6 @@ EXTRA_DIST = doxygen.cfg
 library_includedir=$(includedir)/usbg
 library_include_HEADERS = include/usbg/usbg.h include/usbg/usbg_version.h
 function_includedir=$(includedir)/usbg/function
-function_include_HEADERS = include/usbg/function/ffs.h include/usbg/function/loopback.h include/usbg/function/midi.h include/usbg/function/ms.h include/usbg/function/net.h include/usbg/function/phonet.h include/usbg/function/serial.h include/usbg/function/hid.h include/usbg/function/uac2.h include/usbg/function/scm.h
+function_include_HEADERS = include/usbg/function/ffs.h include/usbg/function/loopback.h include/usbg/function/midi.h include/usbg/function/ms.h include/usbg/function/net.h include/usbg/function/phonet.h include/usbg/function/serial.h include/usbg/function/hid.h include/usbg/function/uac2.h include/usbg/function/hss.h
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libusbgx.pc
diff --git a/include/usbg/function/scm.h → include/usbg/function/hss.h b/include/usbg/function/scm.h → include/usbg/function/hss.h
@@ -10,17 +10,17 @@
  * Lesser General Public License for more details.
  */
 
-#ifndef USBG_FUNCTION_SCM__
-#define USBG_FUNCTION_SCM__
+#ifndef USBG_FUNCTION_HSS__
+#define USBG_FUNCTION_HSS__
 
 #include <usbg/usbg.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct usbg_f_scm;
-typedef struct usbg_f_serial usbg_f_scm;
+struct usbg_f_hss;
+typedef struct usbg_f_serial usbg_f_hss;
 
 #ifdef __cplusplus
 }

diff --git a/include/usbg/usbg.h b/include/usbg/usbg.h
@@ -219,7 +219,7 @@ typedef enum
 	USBG_F_LOOPBACK,
 	USBG_F_HID,
 	USBG_F_UAC2,
-	USBG_F_SCM,
+	USBG_F_HSS,
 	USBG_FUNCTION_TYPE_MAX,
 } usbg_function_type;
 

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = std-options subdir-objects
 lib_LTLIBRARIES = libusbgx.la
-libusbgx_la_SOURCES = usbg.c usbg_error.c usbg_common.c function/ether.c function/ffs.c function/midi.c function/ms.c function/phonet.c function/serial.c function/loopback.c function/hid.c function/uac2.c function/scm.c
+libusbgx_la_SOURCES = usbg.c usbg_error.c usbg_common.c function/ether.c function/ffs.c function/midi.c function/ms.c function/phonet.c function/serial.c function/loopback.c function/hid.c function/uac2.c function/hss.c
 if TEST_GADGET_SCHEMES
 libusbgx_la_SOURCES += usbg_schemes_libconfig.c usbg_common_libconfig.c
 else

diff --git a/src/function/scm.c → src/function/hss.c b/src/function/scm.c → src/function/hss.c
@@ -12,51 +12,51 @@
 
 #include "usbg/usbg.h"
 #include "usbg/usbg_internal.h"
-//#include "usbg/function/scm.h"
+//#include "usbg/function/hss.h"
 
 #ifdef HAS_GADGET_SCHEMES
 #include <libconfig.h>
 #endif
 
-struct usbg_f_scm {
+struct usbg_f_hss {
 	struct usbg_function func;
 };
 
-GENERIC_ALLOC_INST(scm, struct usbg_f_scm, func);
+GENERIC_ALLOC_INST(hss, struct usbg_f_hss, func);
 
-GENERIC_FREE_INST(scm, struct usbg_f_scm, func);
+GENERIC_FREE_INST(hss, struct usbg_f_hss, func);
 
-static int scm_set_attrs(struct usbg_function *f, void *f_attrs)
+static int hss_set_attrs(struct usbg_function *f, void *f_attrs)
 {
 	return USBG_SUCCESS;
 }
 
-static int scm_get_attrs(struct usbg_function *f, void *f_attrs)
+static int hss_get_attrs(struct usbg_function *f, void *f_attrs)
 {
 	return USBG_SUCCESS;
 }
 
-static int scm_libconfig_import(struct usbg_function *f,
+static int hss_libconfig_import(struct usbg_function *f,
 				  config_setting_t *root)
 {
 	return USBG_SUCCESS;
 }
 
-static int scm_libconfig_export(struct usbg_function *f,
+static int hss_libconfig_export(struct usbg_function *f,
 				  config_setting_t *root)
 {
 	return USBG_SUCCESS;
 }
 
-#define SCM_FUNCTION_OPTS			\
-	.alloc_inst = scm_alloc_inst,		\
-	.free_inst = scm_free_inst,	        \
-	.set_attrs = scm_set_attrs,	        \
-	.get_attrs = scm_get_attrs,	        \
-	.export = scm_libconfig_export,	\
-	.import = scm_libconfig_import
-
-struct usbg_function_type usbg_f_type_scm = {
-	.name = "scm",
-	SCM_FUNCTION_OPTS,
+#define HSS_FUNCTION_OPTS			\
+	.alloc_inst = hss_alloc_inst,		\
+	.free_inst = hss_free_inst,	        \
+	.set_attrs = hss_set_attrs,	        \
+	.get_attrs = hss_get_attrs,	        \
+	.export = hss_libconfig_export,	\
+	.import = hss_libconfig_import
+
+struct usbg_function_type usbg_f_type_hss = {
+	.name = "hss",
+	HSS_FUNCTION_OPTS,
 };
diff --git a/src/usbg.c b/src/usbg.c
@@ -52,7 +52,7 @@ extern struct usbg_function_type usbg_f_type_phonet;
 extern struct usbg_function_type usbg_f_type_loopback;
 extern struct usbg_function_type usbg_f_type_hid;
 extern struct usbg_function_type usbg_f_type_uac2;
-extern struct usbg_function_type usbg_f_type_scm;
+extern struct usbg_function_type usbg_f_type_hss;
 
 /**
  * @var function_types
@@ -74,7 +74,7 @@ struct usbg_function_type* function_types[] = {
 	[USBG_F_LOOPBACK] = &usbg_f_type_loopback,
 	[USBG_F_HID] = &usbg_f_type_hid,
 	[USBG_F_UAC2] = &usbg_f_type_uac2,
-	[USBG_F_SCM] = &usbg_f_type_scm,
+	[USBG_F_HSS] = &usbg_f_type_hss,
 };
 
 ARRAY_SIZE_SENTINEL(function_types, USBG_FUNCTION_TYPE_MAX);