[PATCH v4 5/6] libusbg: Add remove gadget functionality.

[Krzysztof Opasiak <k.opasiak@xxxxxxxxxxx>]

Add function which allow to remove USB gadget.
This functions also remove gadget from internal
library structures what means that after this
operation all pointers to removed gadget are invalid.

Signed-off-by: Krzysztof Opasiak <k.opasiak@xxxxxxxxxxx>
---
 include/usbg/usbg.h |    9 +++++++++
 src/usbg.c          |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/include/usbg/usbg.h b/include/usbg/usbg.h
index 4b04551..282485b 100644
--- a/include/usbg/usbg.h
+++ b/include/usbg/usbg.h
@@ -312,6 +312,15 @@ extern int usbg_rm_config(usbg_config *c, int opts);
 extern int usbg_rm_function(usbg_function *f, int opts);
 
 /**
+ * @brief Remove existing USB gadget
+ * @details This function frees also the memory allocated for gadget
+ * @param g Gadget to be removed
+ * @param opts Additional options for configuration removal.
+ * @return 0 on success, usbg_error if error occurred
+ */
+extern int usbg_rm_gadget(usbg_gadget *g, int opts);
+
+/**
  * @brief Remove configuration strings for given language
  * @param c Pointer to configuration
  * @param lang Language of strings which should be deleted
diff --git a/src/usbg.c b/src/usbg.c
index bb7e836..edb7fc3 100644
--- a/src/usbg.c
+++ b/src/usbg.c
@@ -1429,6 +1429,60 @@ int usbg_rm_function(usbg_function *f, int opts)
 	return ret;
 }
 
+int usbg_rm_gadget(usbg_gadget *g, int opts)
+{
+	int ret = USBG_ERROR_INVALID_PARAM;
+	usbg_state *s;
+	if (!g)
+		goto out;
+
+	s = g->parent;
+
+	if (opts & USBG_RM_RECURSE) {
+		/* Recursive flag was given
+		 * so remove all configs and functions
+		 * using recursive flags */
+		usbg_config *c;
+		usbg_function *f;
+		int nmb;
+		char spath[USBG_MAX_PATH_LENGTH];
+
+		while (!TAILQ_EMPTY(&g->configs)) {
+			c = TAILQ_FIRST(&g->configs);
+			ret = usbg_rm_config(c, opts);
+			if (ret != USBG_SUCCESS)
+				goto out;
+		}
+
+		while (!TAILQ_EMPTY(&g->functions)) {
+			f = TAILQ_FIRST(&g->functions);
+			ret = usbg_rm_function(f, opts);
+			if (ret != USBG_SUCCESS)
+				goto out;
+		}
+
+		nmb = snprintf(spath, sizeof(spath), "%s/%s/%s", g->path,
+				g->name, STRINGS_DIR);
+		if (nmb >= sizeof(spath)) {
+			ret = USBG_ERROR_PATH_TOO_LONG;
+			goto out;
+		}
+
+		ret = usbg_rm_all_dirs(spath);
+		if (ret != USBG_SUCCESS)
+			goto out;
+	}
+
+	ret = usbg_rm_dir(g->path, g->name);
+	if (ret == USBG_SUCCESS) {
+		TAILQ_REMOVE(&(s->gadgets), g, gnode);
+		usbg_free_gadget(g);
+	}
+
+out:
+	return ret;
+}
+
 int usbg_rm_config_strs(usbg_config *c, int lang)
 {
 	int ret = USBG_SUCCESS;
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html