Moved includes into a common include directory

diff --git a/debug.h b/debug.h
deleted file mode 100644 (file)
index 5cb6861..0000000
--- a/debug.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * This file is part of the fx2lafw project.
- *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- */
-
-#ifdef DEBUG
-
-#define ERRF(fmt, ...) \
-       do { debugf("E " fmt, __VA_ARGS__); \
-               while(1); } while(0)
-#define ERR(msg) \
-       ERRF("%s", msg)
-
-#define WARNF(fmt, ...) \
-       debugf("W " fmt, __VA_ARGS__)
-#define WARN(msg) \
-       WARNF("%s", msg)
-
-#define INFOF(fmt, ...) \
-       debugf("I " fmt, __VA_ARGS__)
-#define INFO(msg) \
-       INFOF("%s", msg)
-
-/**
- * A printf the prints messages through the UART
- * EP6.
- */
-void debugf(const char *format, ...);
-
-#else
-
-#define ERRF(fmt, ...) \
-       ((void) 0)
-#define ERR(msg) \
-       ((void) 0)
-
-#define WARNF(fmt, ...) \
-       ((void) 0)
-#define WARN(msg) \
-       ((void) 0)
-
-#define INFOF(fmt, ...) \
-       ((void) 0)
-#define INFO(msg) \
-       ((void) 0)
-
-#endif

diff --git a/fx2lafw.h b/fx2lafw.h
deleted file mode 100644 (file)
index 5819b6c..0000000
--- a/fx2lafw.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the fx2lafw project.
- *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- */
-
-#include <autovector.h>
-
-/**
- * Performs setup common to all fx2lafw devices.
- */
-void fx2lafw_init(void);
-
-/**
- * Performs a single iteration of the main loop code which is common
- * to all fx2lafw devices.
- */
-void fx2lafw_run(void);

diff --git a/fx2lafw.mk b/fx2lafw.mk
index 20956ec86505f598f92a6dcdf0c6325c087f5c4b..a8f7a3b475275c38e8f83032e3983c43cfd78ed5 100644 (file)
--- a/fx2lafw.mk
+++ b/fx2lafw.mk
@@ -28,6 +28,6 @@ else
        SDCCFLAGS += -DNDEBUG
 endif
 
-SDCCFLAGS += -I../
+SDCCFLAGS += -I../include/
 
 include $(FX2LIBDIR)/lib/fx2.mk

diff --git a/include/debug.h b/include/debug.h
new file mode 100644 (file)
index 0000000..5cb6861
--- /dev/null
+++ b/include/debug.h
@@ -0,0 +1,62 @@
+/*
+ * This file is part of the fx2lafw project.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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
+ */
+
+#ifdef DEBUG
+
+#define ERRF(fmt, ...) \
+       do { debugf("E " fmt, __VA_ARGS__); \
+               while(1); } while(0)
+#define ERR(msg) \
+       ERRF("%s", msg)
+
+#define WARNF(fmt, ...) \
+       debugf("W " fmt, __VA_ARGS__)
+#define WARN(msg) \
+       WARNF("%s", msg)
+
+#define INFOF(fmt, ...) \
+       debugf("I " fmt, __VA_ARGS__)
+#define INFO(msg) \
+       INFOF("%s", msg)
+
+/**
+ * A printf the prints messages through the UART
+ * EP6.
+ */
+void debugf(const char *format, ...);
+
+#else
+
+#define ERRF(fmt, ...) \
+       ((void) 0)
+#define ERR(msg) \
+       ((void) 0)
+
+#define WARNF(fmt, ...) \
+       ((void) 0)
+#define WARN(msg) \
+       ((void) 0)
+
+#define INFOF(fmt, ...) \
+       ((void) 0)
+#define INFO(msg) \
+       ((void) 0)
+
+#endif

diff --git a/include/fx2lafw.h b/include/fx2lafw.h
new file mode 100644 (file)
index 0000000..5819b6c
--- /dev/null
+++ b/include/fx2lafw.h
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the fx2lafw project.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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
+ */
+
+#include <autovector.h>
+
+/**
+ * Performs setup common to all fx2lafw devices.
+ */
+void fx2lafw_init(void);
+
+/**
+ * Performs a single iteration of the main loop code which is common
+ * to all fx2lafw devices.
+ */
+void fx2lafw_run(void);