Split isi.h into isimodem.h and isiutil.h

2 files changed, 64 insertions, 56 deletions

diff --git a/drivers/isimodem/isi.h b/drivers/isimodem/isimodem.h
index 4959a18c..3eb2fbed 100644
--- a/drivers/isimodem/isi.h
+++ b/drivers/isimodem/isimodem.h
@@ -3,8 +3,6 @@
  *
  * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
  *
- * Contact: Aki Niemi <aki.niemi@nokia.com>
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * version 2 as published by the Free Software Foundation.
@@ -21,60 +19,6 @@
  *
  */
 
-#define CALLBACK_WITH_FAILURE(f, args...)		\
-	do {						\
-		struct ofono_error e;			\
-		e.type = OFONO_ERROR_TYPE_FAILURE;	\
-		e.error = 0;				\
-		f(&e, ##args);				\
-	} while(0)					\
-
-#define CALLBACK_WITH_SUCCESS(f, args...)		\
-	do {						\
-		struct ofono_error e;			\
-		e.type = OFONO_ERROR_TYPE_NO_ERROR;	\
-		e.error = 0;				\
-		f(&e, ##args);				\
-	} while(0)					\
-
-struct isi_cb_data {
-	void *cb;
-	void *data;
-	void *user;
-};
-
-struct isi_version {
-	unsigned short major;
-	unsigned short minor;
-};
-
-static inline struct isi_cb_data *isi_cb_data_new(void *user, void *cb,
-							void *data)
-{
-	struct isi_cb_data *ret;
-
-	ret = g_try_new0(struct isi_cb_data, 1);
-
-	if (ret) {
-		ret->cb = cb;
-		ret->data = data;
-		ret->user = user;
-	}
-	return ret;
-}
-
-static inline void dump_msg(const unsigned char *msg, size_t len)
-{
-	char dumpstr[len * 5 + len / 10 + 1];
-	size_t i;
-
-	for (i = 0; i < len; i++)
-		sprintf(dumpstr + i * 5, "0x%02x%s",
-			msg[i], (i + 1) % 10 == 0 ? "\n" : " ");
-
-	DBG("\n%s\n", dumpstr);
-}
-
 extern void isi_phonebook_init();
 extern void isi_phonebook_exit();
 
diff --git a/drivers/isimodem/isiutil.h b/drivers/isimodem/isiutil.h
new file mode 100644
index 00000000..95fcb590
--- /dev/null
+++ b/drivers/isimodem/isiutil.h
@@ -0,0 +1,64 @@
+/*
+ * This file is part of oFono - Open Source Telephony
+ *
+ * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __ISIMODEM_UTIL_H
+#define __ISIMODEM_UTIL_H
+
+struct isi_cb_data {
+	void *cb;
+	void *data;
+	void *user;
+};
+
+static inline struct isi_cb_data *isi_cb_data_new(void *user, void *cb,
+							void *data)
+{
+	struct isi_cb_data *ret;
+
+	ret = g_try_new0(struct isi_cb_data, 1);
+
+	if (ret) {
+		ret->cb = cb;
+		ret->data = data;
+		ret->user = user;
+	}
+	return ret;
+}
+
+#define CALLBACK_WITH_FAILURE(f, args...)		\
+	do {						\
+		struct ofono_error e;			\
+		e.type = OFONO_ERROR_TYPE_FAILURE;	\
+		e.error = 0;				\
+		f(&e, ##args);				\
+	} while(0)
+
+#define CALLBACK_WITH_SUCCESS(f, args...)		\
+	do {						\
+		struct ofono_error e;			\
+		e.type = OFONO_ERROR_TYPE_NO_ERROR;	\
+		e.error = 0;				\
+		f(&e, ##args);				\
+	} while(0)
+
+void dump_msg(const unsigned char *msg, size_t len);
+
+#endif /* !__ISIMODEM_UTIL_H */