lib: move generic code to lib.c. No tech change

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

lib: move generic code to lib.c. No tech change
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
85535509 · Alessandro Rubini · c19c38ce · 85535509 · 85535509 · 85535509
Commit 85535509 authored Jul 02, 2013 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 59 additions and 45 deletions

Makefile lib/Makefile +1 -0

lib.c lib/lib.c +58 -0

route.c lib/route.c +0 -45

No files found.
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -4,6 +4,7 @@ ZIO ?= ../zio
 LIB = libfmcadc.a
 LOBJ := route.o
 LOBJ += boards.o
+LOBJ += lib.o
 LOBJ += fmcadc-lib-zio.o

 CFLAGS = -Wall -ggdb -O2 -I../kernel -I$(ZIO)/include

--- a/lib/lib.c
+++ b/lib/lib.c
+/*
+ * Initializing and cleaning up the fmc adc library
+ *
+ * Copyright (C) 2013 CERN (www.cern.ch)
+ * Author: Federico Vaga <federico.vaga@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2 as published by the Free Software Foundation or, at your
+ * option, any later version.
+ */
+#include <string.h>
+#include "fmcadc-lib.h"
+#include "fmcadc-lib-int.h"
+
+/* * * * * * * * * * * * * * * * Utilities * * * * * * * * * * * * * * * * */
+/*
+ * fmcadc_strerror
+ * @dev: device for which you want to know the meaning of the error
+ * @errnum: error number
+ */
+
+static struct fmcadc_errors {
+	int num;
+	char *str;
+} fmcadc_errors[] = {
+	{ FMCADC_ENOP,		"Operation not supported"},
+	{ FMCADC_ENOCAP,	"Capabilities not supported"},
+	{ FMCADC_ENOCFG,	"Configuration type not supported"},
+	{ FMCADC_ENOGET,	"Cannot get capabilities information"},
+	{ FMCADC_ENOSET,	"Cannot set capabilities information"},
+	{ FMCADC_ENOCHAN,	"Invalid channel"},
+	{ FMCADC_ENOMASK,	"Missing configuration mask"},
+	{ 0, }
+};
+
+char *fmcadc_strerror(int errnum)
+{
+	struct fmcadc_errors *p;
+
+	if (errnum < __FMCADC_ERRNO_START)
+		return strerror(errnum);
+	for (p = fmcadc_errors; p->num; p++)
+		if (p->num == errnum)
+			return p->str;
+	return "Unknown error code";
+}
+
+/*
+ * fmcadc_get_driver_type
+ * @dev: device which want to know the driver type
+ */
+char *fmcadc_get_driver_type(struct fmcadc_dev *dev)
+{
+	struct fmcadc_gid *b = (void *)dev;
+
+	return b->board->driver_type;
+}
--- a/lib/route.c
+++ b/lib/route.c
@@ -223,48 +223,3 @@ int fmcadc_release_buffer(struct fmcadc_dev *dev, struct fmcadc_buffer *buf,
 		return -1;
 	}
 }
-
-
-/* * * * * * * * * * * * * * * * Utilities * * * * * * * * * * * * * * * * */
-/*
- * fmcadc_strerror
- * @dev: device for which you want to know the meaning of the error
- * @errnum: error number
- */
-
-static struct fmcadc_errors {
-	int num;
-	char *str;
-} fmcadc_errors[] = {
-	{ FMCADC_ENOP,		"Operation not supported"},
-	{ FMCADC_ENOCAP,	"Capabilities not supported"},
-	{ FMCADC_ENOCFG,	"Configuration type not supported"},
-	{ FMCADC_ENOGET,	"Cannot get capabilities information"},
-	{ FMCADC_ENOSET,	"Cannot set capabilities information"},
-	{ FMCADC_ENOCHAN,	"Invalid channel"},
-	{ FMCADC_ENOMASK,	"Missing configuration mask"},
-	{ 0, }
-};
-
-char *fmcadc_strerror(int errnum)
-{
-	struct fmcadc_errors *p;
-
-	if (errnum < __FMCADC_ERRNO_START)
-		return strerror(errnum);
-	for (p = fmcadc_errors; p->num; p++)
-		if (p->num == errnum)
-			return p->str;
-	return "Unknown error code";
-}
-
-/*
- * fmcadc_get_driver_type
- * @dev: device which want to know the driver type
- */
-char *fmcadc_get_driver_type(struct fmcadc_dev *dev)
-{
-	struct fmcadc_gid *b = (void *)dev;
-
-	return b->board->driver_type;
-}