Remove FSF address from GPL notices

[openocd] / src / pld / pld.c

diff --git a/src/pld/pld.c b/src/pld/pld.c
index 6a0bd93dcc917e444a720cdadfa9c488cf9082d3..5210b97b7d300c51109c7066b3d63f18dfa456cd 100644 (file)
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -13,10 +13,9 @@
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -30,8 +29,7 @@
  */
 extern struct pld_driver virtex2_pld;
 
-static struct pld_driver *pld_drivers[] =
-{
+static struct pld_driver *pld_drivers[] = {
        &virtex2_pld,
        NULL,
 };
@@ -43,12 +41,9 @@ struct pld_device *get_pld_device_by_num(int num)
        struct pld_device *p;
        int i = 0;
 
-       for (p = pld_devices; p; p = p->next)
-       {
+       for (p = pld_devices; p; p = p->next) {
                if (i++ == num)
-               {
                        return p;
-               }
        }
 
        return NULL;
@@ -62,24 +57,18 @@ COMMAND_HANDLER(handle_pld_device_command)
        int found = 0;
 
        if (CMD_ARGC < 1)
-       {
-               LOG_WARNING("incomplete 'pld device' command");
-               return ERROR_OK;
-       }
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
-       for (i = 0; pld_drivers[i]; i++)
-       {
-               if (strcmp(CMD_ARGV[0], pld_drivers[i]->name) == 0)
-               {
+       for (i = 0; pld_drivers[i]; i++) {
+               if (strcmp(CMD_ARGV[0], pld_drivers[i]->name) == 0) {
                        struct pld_device *p, *c;
 
                        /* register pld specific commands */
                        int retval;
                        if (pld_drivers[i]->commands) {
-                               retval = register_commands(CMD_CTX, NULL, 
+                               retval = register_commands(CMD_CTX, NULL,
                                                pld_drivers[i]->commands);
-                               if (ERROR_OK != retval)
-                               {
+                               if (ERROR_OK != retval) {
                                        LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]);
                                        return ERROR_FAIL;
                                }
@@ -89,34 +78,31 @@ COMMAND_HANDLER(handle_pld_device_command)
                        c->driver = pld_drivers[i];
                        c->next = NULL;
 
-                       retval = CALL_COMMAND_HANDLER(pld_drivers[i]->pld_device_command, c);
-                       if (ERROR_OK != retval)
-                       {
-                               LOG_ERROR("'%s' driver rejected pld device", CMD_ARGV[0]);
+                       retval = CALL_COMMAND_HANDLER(
+                                       pld_drivers[i]->pld_device_command, c);
+                       if (ERROR_OK != retval) {
+                               LOG_ERROR("'%s' driver rejected pld device",
+                                       CMD_ARGV[0]);
                                free(c);
                                return ERROR_OK;
                        }
 
                        /* put pld device in linked list */
-                       if (pld_devices)
-                       {
+                       if (pld_devices) {
                                /* find last pld device */
-                               for (p = pld_devices; p && p->next; p = p->next);
+                               for (p = pld_devices; p && p->next; p = p->next)
+                                       ;
                                if (p)
                                        p->next = c;
-                       }
-                       else
-                       {
+                       } else
                                pld_devices = c;
-                       }
 
                        found = 1;
                }
        }
 
        /* no matching pld driver found */
-       if (!found)
-       {
+       if (!found) {
                LOG_ERROR("pld driver '%s' not found", CMD_ARGV[0]);
                exit(-1);
        }
@@ -129,16 +115,13 @@ COMMAND_HANDLER(handle_pld_devices_command)
        struct pld_device *p;
        int i = 0;
 
-       if (!pld_devices)
-       {
+       if (!pld_devices) {
                command_print(CMD_CTX, "no pld devices configured");
                return ERROR_OK;
        }
 
        for (p = pld_devices; p; p = p->next)
-       {
                command_print(CMD_CTX, "#%i: %s", i++, p->driver->name);
-       }
 
        return ERROR_OK;
 }
@@ -152,31 +135,24 @@ COMMAND_HANDLER(handle_pld_load_command)
        gettimeofday(&start, NULL);
 
        if (CMD_ARGC < 2)
-       {
-               command_print(CMD_CTX, "usage: pld load <device#> <file>");
-               return ERROR_OK;
-       }
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
        unsigned dev_id;
        COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id);
        p = get_pld_device_by_num(dev_id);
-       if (!p)
-       {
+       if (!p) {
                command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
                return ERROR_OK;
        }
 
-       if ((retval = p->driver->load(p, CMD_ARGV[1])) != ERROR_OK)
-       {
+       retval = p->driver->load(p, CMD_ARGV[1]);
+       if (retval != ERROR_OK) {
                command_print(CMD_CTX, "failed loading file %s to pld device %u",
                        CMD_ARGV[1], dev_id);
-               switch (retval)
-               {
+               switch (retval) {
                }
                return retval;
-       }
-       else
-       {
+       } else {
                gettimeofday(&end, NULL);
                timeval_subtract(&duration, &end, &start);
 
@@ -191,20 +167,21 @@ COMMAND_HANDLER(handle_pld_load_command)
 static const struct command_registration pld_exec_command_handlers[] = {
        {
                .name = "devices",
-               .handler = &handle_pld_devices_command,
+               .handler = handle_pld_devices_command,
                .mode = COMMAND_EXEC,
                .help = "list configured pld devices",
        },
        {
                .name = "load",
-               .handler = &handle_pld_load_command,
+               .handler = handle_pld_load_command,
                .mode = COMMAND_EXEC,
                .help = "load configuration file into PLD",
-               .usage = "<device#> <file>",
+               .usage = "pld_num filename",
        },
        COMMAND_REGISTRATION_DONE
 };
-int pld_init(struct command_context *cmd_ctx)
+
+static int pld_init(struct command_context *cmd_ctx)
 {
        if (!pld_devices)
                return ERROR_OK;
@@ -218,9 +195,8 @@ COMMAND_HANDLER(handle_pld_init_command)
        if (CMD_ARGC != 0)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       static bool pld_initialized = false;
-       if (pld_initialized)
-       {
+       static bool pld_initialized;
+       if (pld_initialized) {
                LOG_INFO("'pld init' has already been called");
                return ERROR_OK;
        }
@@ -234,15 +210,16 @@ static const struct command_registration pld_config_command_handlers[] = {
        {
                .name = "device",
                .mode = COMMAND_CONFIG,
-               .handler = &handle_pld_device_command,
+               .handler = handle_pld_device_command,
                .help = "configure a PLD device",
-               .usage = "<driver> ...",
+               .usage = "driver_name [driver_args ... ]",
        },
        {
                .name = "init",
                .mode = COMMAND_CONFIG,
-               .handler = &handle_pld_init_command,
+               .handler = handle_pld_init_command,
                .help = "initialize PLD devices",
+               .usage = ""
        },
        COMMAND_REGISTRATION_DONE
 };
@@ -251,7 +228,7 @@ static const struct command_registration pld_command_handler[] = {
                .name = "pld",
                .mode = COMMAND_ANY,
                .help = "programmable logic device commands",
-
+               .usage = "",
                .chain = pld_config_command_handlers,
        },
        COMMAND_REGISTRATION_DONE