diff options
| author | Martin Burnicki <martin.burnicki@meinberg.de> | 2023-02-28 23:13:38 +0100 |
|---|---|---|
| committer | Martin Burnicki <martin.burnicki@meinberg.de> | 2023-02-28 23:13:38 +0100 |
| commit | 9094005b0f0ff1c1d6bc21ae6fad43b571638c79 (patch) | |
| tree | 7af77e900d1c2b5d6548422802cdbb1847438783 | |
| parent | 5e9bcf9738855d8371f15fc12cb934197056b4dc (diff) | |
| download | mbgreadtimestring-9094005b0f0ff1c1d6bc21ae6fad43b571638c79.tar.gz mbgreadtimestring-9094005b0f0ff1c1d6bc21ae6fad43b571638c79.zip | |
Account for mbglib API changes1.2
Also increase version to 1.2 and copyright year to 2023
| -rw-r--r-- | mbgreadtimestring.c | 25 | ||||
| -rw-r--r-- | unix/Makefile | 10 |
2 files changed, 20 insertions, 15 deletions
diff --git a/mbgreadtimestring.c b/mbgreadtimestring.c index 61c8ebf..fbc9079 100644 --- a/mbgreadtimestring.c +++ b/mbgreadtimestring.c @@ -1,8 +1,7 @@ /************************************************************************** * - * $Id: mbgreadtimestring.c 1.1 2009/10/09 15:49:56 martin REL_M $ - * $Name: MBGREADTIMESTR_1_1 $ + * $Id: mbgreadtimestring.c 1.2 2023/02/28 21:54:29 martin.burnicki REL_M $ * * Copyright (c) Meinberg Funkuhren, Bad Pyrmont, Germany * @@ -21,6 +20,9 @@ * * ----------------------------------------------------------------------- * $Log: mbgreadtimestring.c $ + * Revision 1.2 2023/02/28 21:54:29 martin.burnicki + * New version 1.2 and copyright year 2023. + * Account for mbglib API changes. * Revision 1.1 2009/10/09 15:49:56 martin * Initial revision. * @@ -34,8 +36,8 @@ static const char *pname = "mbgreadtimestring"; -static const char *pversion = "v1.1"; -static const char *pcopyright = "(c) Meinberg 2009"; +static const char *pversion = "v1.2"; +static const char *pcopyright = "(c) Meinberg 2009-2023"; /* other local variables */ @@ -50,7 +52,7 @@ static int quiet; static const char *default_target = DEFAULT_DEV_NAME; -static SERIAL_IO_STATUS serio_st; +static MBGSERIO_DEV *p_sdev; #if _USE_SERIAL_IO static uint32_t default_baudrate = 19200L; @@ -140,7 +142,7 @@ done: /*HDR*/ static void close_connection( void ) { - mbgserio_close( &serio_st ); + mbgserio_close( &p_sdev ); } /* close_connection */ @@ -302,16 +304,15 @@ int main( int argc, char *argv[] ) } #if _USE_SERIAL_IO - rc = mbgserio_open( &serio_st, target ); + rc = mbgserio_open( &p_sdev, target ); if ( rc < 0 ) { - if ( !quiet ) - printf( "Error opening port %s.\n", target ); + fprintf( stderr, "Failed to open %s: %s\n", target, mbg_strerror( rc ) ); return 1; // Error ... } - mbgserio_set_parms( &serio_st, baudrate, framing ); + mbgserio_set_parms( p_sdev, baudrate, framing ); if ( !quiet ) printf( "Using %s with %li baud, %s\n", @@ -326,10 +327,10 @@ int main( int argc, char *argv[] ) if ( must_query ) { char request_char = '?'; - _mbgserio_write( serio_st.port_handle, &request_char, sizeof( request_char ) ); + mbgserio_write( p_sdev, &request_char, sizeof( request_char ) ); } - rc = read_timestring( serio_st.port_handle, ts, sizeof( ts ) ); + rc = read_timestring( p_sdev->port_handle, ts, sizeof( ts ) ); if ( rc > 0 ) { diff --git a/unix/Makefile b/unix/Makefile index 0630759..171e192 100644 --- a/unix/Makefile +++ b/unix/Makefile @@ -1,7 +1,7 @@ ######################################################################### # -# $Id: Makefile 1.1 2009/10/09 15:49:56 martin REL_M $ +# $Id: Makefile 1.2 2023/02/28 21:46:40 martin.burnicki REL_M $ # # Description: # Makefile for mbgreadtimestring for Unix-like systems. @@ -9,6 +9,8 @@ # # ----------------------------------------------------------------------- # $Log: Makefile $ +# Revision 1.2 2023/02/28 21:46:40 martin.burnicki +# Added some mbglib files. # Revision 1.1 2009/10/09 15:49:56 martin # Initial revision. # @@ -37,8 +39,10 @@ CFLAGS += $(LOC_INCL) CFLAGS += -D_USE_SERIAL_IO=1 -SRCS=../$(TARGET).c \ - $(MBGLIB_COMMON)/mbgserio.c +SRCS = ../$(TARGET).c +SRCS += $(MBGLIB_COMMON)/mbgserio.c +SRCS += $(MBGLIB_COMMON)/mbgerror.c +SRCS += $(MBGLIB_COMMON)/str_util.c all: $(TARGET) |