diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2014-07-19 11:30:05 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2014-07-19 11:30:05 +0000 |
| commit | 4d7817c8049b61434dc8cbd017a314273e38e208 (patch) | |
| tree | 338a9f97671bc25af92d660f22b061254878e0a5 /libgphoto2_port/serial | |
| parent | 454b76fbe4eb16de8fec2e9865147d6b98ce6c24 (diff) | |
| download | libgphoto2-4d7817c8049b61434dc8cbd017a314273e38e208.tar.gz | |
From: Axel Waggershauser <awagger@web.de>
2) only replaces the existing GP_DEBUG with the new GP_LOG_D and
removes the GP_MODULE strings
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15080 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'libgphoto2_port/serial')
| -rw-r--r-- | libgphoto2_port/serial/unix.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libgphoto2_port/serial/unix.c b/libgphoto2_port/serial/unix.c index 0684e1a9a..f77fcf2bf 100644 --- a/libgphoto2_port/serial/unix.c +++ b/libgphoto2_port/serial/unix.c @@ -198,8 +198,6 @@ #define GP_PORT_SERIAL_RANGE_HIGH 0 #endif -#define GP_MODULE "serial" - struct _GPPortPrivateLibrary { int fd; /* Device handle */ int baudrate; /* Current speed */ @@ -875,13 +873,13 @@ gp_port_serial_check_speed (GPPort *dev) cfsetispeed (&tio, speed); cfsetospeed (&tio, speed); if (tcsetattr (dev->pl->fd, TCSANOW, &tio) < 0) { - GP_DEBUG ("Error on 'tcsetattr'."); + GP_LOG_E ("Error on 'tcsetattr'."); return GP_ERROR_IO_SERIAL_SPEED; } /* Clear O_NONBLOCK. */ if (fcntl (dev->pl->fd, F_SETFL, 0) < 0) { - GP_DEBUG ("Error on 'fcntl'."); + GP_LOG_E ("Error on 'fcntl'."); return GP_ERROR_IO_SERIAL_SPEED; } @@ -894,12 +892,12 @@ gp_port_serial_check_speed (GPPort *dev) */ if (speed != B0) { if (tcgetattr (dev->pl->fd, &tio)) { - GP_DEBUG ("Error on 'tcgetattr'."); + GP_LOG_E ("Error on 'tcgetattr'."); return (GP_ERROR_IO_SERIAL_SPEED); } if ((cfgetispeed (&tio) != speed) || (cfgetospeed (&tio) != speed)) { - GP_DEBUG ("Cannot set baudrate to %d...", + GP_LOG_E ("Cannot set baudrate to %d...", dev->settings.serial.speed); return (GP_ERROR_NOT_SUPPORTED); } |