From: Joel Holdsworth Date: Sat, 24 Mar 2012 12:29:25 +0000 (+0000) Subject: Moved main() into fx2lafw.c X-Git-Tag: sigrok-firmware-fx2lafw-0.1.0~37 X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=f7f91781e4d4d5543371d76bb295316a6655e535;hp=00060cecdb4d3332f2a1a705436de3b6d08d1106;p=sigrok-firmware-fx2lafw.git Moved main() into fx2lafw.c --- diff --git a/fx2lafw.c b/fx2lafw.c index c523b160..f69fcd5a 100644 --- 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 b40892c8..d0faa468 100644 --- 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 index 941bdd08..00000000 --- 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 - * Copyright (C) 2012 Joel Holdsworth - * - * 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 - -void main(void) -{ - fx2lafw_init(); - - while (1) - fx2lafw_poll(); -} diff --git a/hw/cwav-usbeesx/Makefile b/hw/cwav-usbeesx/Makefile index a585a49b..d5713a47 100644 --- 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 index 941bdd08..00000000 --- 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 - * Copyright (C) 2012 Joel Holdsworth - * - * 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 - -void main(void) -{ - fx2lafw_init(); - - while (1) - fx2lafw_poll(); -} diff --git a/hw/saleae-logic/Makefile b/hw/saleae-logic/Makefile index ff65939c..f1e239d3 100644 --- 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 index 18e793ff..00000000 --- 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 - * - * 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 - -void main(void) -{ - fx2lafw_init(); - - while (1) - fx2lafw_poll(); -}