Moved main() into fx2lafw.c

diff --git a/fx2lafw.c b/fx2lafw.c
index c523b1609eb82f0f27f061f177e24e6ce1d93a89..f69fcd5af6b068898c99861c05d593b0b502bfd1 100644 (file)
--- a/fx2lafw.c
+++ b/fx2lafw.c
@@ -257,3 +257,10 @@ void fx2lafw_poll(void)
 
        gpif_poll();
 }
+
+void main(void)
+{
+       fx2lafw_init();
+       while (1)
+               fx2lafw_poll();
+}

diff --git a/hw/cwav-usbeeax/Makefile b/hw/cwav-usbeeax/Makefile
index b40892c86e0dd085b5fdfec8beeea8258236393c..d0faa468d60cd9567c05dc291945191678dc80dc 100644 (file)
--- a/hw/cwav-usbeeax/Makefile
+++ b/hw/cwav-usbeeax/Makefile
@@ -19,7 +19,6 @@
 ##
 
 SOURCES = \
-       main.c \
        ../../fx2lafw.c \
        ../../gpif-acquisition.c
 A51_SOURCES = dscr.a51

diff --git a/hw/cwav-usbeeax/main.c b/hw/cwav-usbeeax/main.c
deleted file mode 100644 (file)
index 941bdd0..0000000
--- a/hw/cwav-usbeeax/main.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the fx2lafw project.
- *
- * Copyright (C) 2011-2012 Uwe Hermann <uwe@hermann-uwe.de>
- * 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 <fx2lafw.h>
-
-void main(void)
-{
-       fx2lafw_init();
-
-       while (1)
-               fx2lafw_poll();
-}

diff --git a/hw/cwav-usbeesx/Makefile b/hw/cwav-usbeesx/Makefile
index a585a49bac03b0fe7eacdf45747c5ffb95162393..d5713a478ade68d2e78186536744f0178d6f0d18 100644 (file)
--- a/hw/cwav-usbeesx/Makefile
+++ b/hw/cwav-usbeesx/Makefile
@@ -20,7 +20,6 @@
 ##
 
 SOURCES = \
-       main.c \
        ../../fx2lafw.c \
        ../../gpif-acquisition.c
 A51_SOURCES = dscr.a51

diff --git a/hw/cwav-usbeesx/main.c b/hw/cwav-usbeesx/main.c
deleted file mode 100644 (file)
index 941bdd0..0000000
--- a/hw/cwav-usbeesx/main.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the fx2lafw project.
- *
- * Copyright (C) 2011-2012 Uwe Hermann <uwe@hermann-uwe.de>
- * 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 <fx2lafw.h>
-
-void main(void)
-{
-       fx2lafw_init();
-
-       while (1)
-               fx2lafw_poll();
-}

diff --git a/hw/saleae-logic/Makefile b/hw/saleae-logic/Makefile
index ff65939ca6f3d7e6c08536100e58076b77ed78da..f1e239d32a4c577d506ce708724331cb47367757 100644 (file)
--- a/hw/saleae-logic/Makefile
+++ b/hw/saleae-logic/Makefile
@@ -19,7 +19,6 @@
 ##
 
 SOURCES = \
-       main.c \
        ../../fx2lafw.c \
        ../../gpif-acquisition.c
 A51_SOURCES = dscr.a51

diff --git a/hw/saleae-logic/main.c b/hw/saleae-logic/main.c
deleted file mode 100644 (file)
index 18e793f..0000000
--- a/hw/saleae-logic/main.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * This file is part of the fx2lafw project.
- *
- * Copyright (C) 2012 Uwe Hermann <uwe@hermann-uwe.de>
- *
- * 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 <fx2lafw.h>
-
-void main(void)
-{
-       fx2lafw_init();
-
-       while (1)
-               fx2lafw_poll();
-}