From dce4185aece9e5f5b54d42f89d61421ccbda06c7 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 14 Jun 2010 22:58:41 +0000 Subject: [PATCH] parport/ppi: sync ppi_connect with ppdev driver to fix build warnings git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1786 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- urjtag/ChangeLog | 3 +++ urjtag/src/tap/parport/ppi.c | 9 +++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog index 9cbbeb84..6aefd685 100644 --- a/urjtag/ChangeLog +++ b/urjtag/ChangeLog @@ -7,6 +7,9 @@ from it, and change the mingw check to key off this header instead to make things a bit more portable. + * src/tap/parport/ppi.c (ppi_connect): Fix return type to match expected, + and tweak style to match ppdev.c better. + 2010-05-19 Arnim Laeuger * src/flash/amd.c, doc/UrJTAG.txt: [ 2996919 ] Support for MX29LV320C diff --git a/urjtag/src/tap/parport/ppi.c b/urjtag/src/tap/parport/ppi.c index 1477431b..dd803f7e 100644 --- a/urjtag/src/tap/parport/ppi.c +++ b/urjtag/src/tap/parport/ppi.c @@ -104,7 +104,7 @@ ppi_parport_free (urj_parport_t *port) free (port); } -static urj_cable_t * +static urj_parport_t * ppi_connect (const char *devname) { port_node_t *pn; @@ -115,19 +115,16 @@ ppi_connect (const char *devname) { urj_log (URJ_LOG_LEVEL_NORMAL, _("Disconnecting %s from ppi port %s\n"), - _(pn->port->cable->driver->description), - devname); + _(pn->port->cable->driver->description), devname); pn->port->cable->driver->disconnect (pn->port->cable); break; } - urj_log (URJ_LOG_LEVEL_NORMAL, _("Initializing on ppi port %s\n"), devname); + urj_log (URJ_LOG_LEVEL_NORMAL, _("Initializing ppi port %s\n"), devname); parport = ppi_parport_alloc (devname); if (!parport) - { return NULL; - } return parport; }