From f837970b8b1a945b77cf7f7c203f4564a4051ed2 Mon Sep 17 00:00:00 2001 From: Marcin Miklas Date: Mon, 21 Jun 2021 19:24:16 +0200 Subject: Revert "Make drop_count unsigned." This reverts commit a5562938744a1d7e22c669d37562f464857aba1c. --- lib/avtp_pipeline/avtp/openavb_avtp.c | 2 +- lib/avtp_pipeline/avtp/openavb_avtp.h | 4 ++-- lib/avtp_pipeline/platform/Linux/avb_host/openavb_harness.c | 7 +------ lib/avtp_pipeline/tl/openavb_talker.c | 2 +- lib/avtp_pipeline/tl/openavb_talker.h | 2 +- lib/avtp_pipeline/tl/openavb_tl.c | 2 +- lib/avtp_pipeline/tl/openavb_tl_pub.h | 2 +- 7 files changed, 8 insertions(+), 13 deletions(-) diff --git a/lib/avtp_pipeline/avtp/openavb_avtp.c b/lib/avtp_pipeline/avtp/openavb_avtp.c index a089ab32..299f2b0d 100644 --- a/lib/avtp_pipeline/avtp/openavb_avtp.c +++ b/lib/avtp_pipeline/avtp/openavb_avtp.c @@ -716,7 +716,7 @@ void openavbAvtpPause(void *handle, bool bPause) AVB_TRACE_EXIT(AVB_TRACE_AVTP); } -void openavbAvtpDrop(void *handle, U32 count) +void openavbAvtpDrop(void *handle, int count) { AVB_TRACE_ENTRY(AVB_TRACE_AVTP); diff --git a/lib/avtp_pipeline/avtp/openavb_avtp.h b/lib/avtp_pipeline/avtp/openavb_avtp.h index 4f9ff79d..baf7b345 100644 --- a/lib/avtp_pipeline/avtp/openavb_avtp.h +++ b/lib/avtp_pipeline/avtp/openavb_avtp.h @@ -142,7 +142,7 @@ typedef struct U64 bytes; // Drop mode counter - U32 drop_avtp_packets; + int drop_avtp_packets; } avtp_stream_t; @@ -180,7 +180,7 @@ void openavbAvtpConfigTimsstampEval(void *handle, U32 tsInterval, U32 reportInte void openavbAvtpPause(void *handle, bool bPause); -void openavbAvtpDrop(void *handle, U32 count); +void openavbAvtpDrop(void *handle, int count); void openavbAvtpShutdownTalker(void *handle); void openavbAvtpShutdownListener(void *handle); diff --git a/lib/avtp_pipeline/platform/Linux/avb_host/openavb_harness.c b/lib/avtp_pipeline/platform/Linux/avb_host/openavb_harness.c index 22df245b..6802c447 100644 --- a/lib/avtp_pipeline/platform/Linux/avb_host/openavb_harness.c +++ b/lib/avtp_pipeline/platform/Linux/avb_host/openavb_harness.c @@ -498,12 +498,7 @@ int main(int argc, char *argv[]) // DROP AVTP packets { int idx = 0; - int tmp = strtol(buf + 1, NULL, 0); - if (tmp <= 0) { - printf("Number must be positive\n"); - break; - } - U32 drop_count = (U32)tmp; + int drop_count = strtol(buf + 1, NULL, 0); char wallclock_msg[32]; struct timespec nowTS; diff --git a/lib/avtp_pipeline/tl/openavb_talker.c b/lib/avtp_pipeline/tl/openavb_talker.c index ef2ad3c9..c9f2b9d4 100644 --- a/lib/avtp_pipeline/tl/openavb_talker.c +++ b/lib/avtp_pipeline/tl/openavb_talker.c @@ -432,7 +432,7 @@ void openavbTLPauseTalker(tl_state_t *pTLState, bool bPause) AVB_TRACE_EXIT(AVB_TRACE_TL); } -void openavbTLDropTalker(tl_state_t *pTLState, U32 drop_count) +void openavbTLDropTalker(tl_state_t *pTLState, int drop_count) { AVB_TRACE_ENTRY(AVB_TRACE_TL); diff --git a/lib/avtp_pipeline/tl/openavb_talker.h b/lib/avtp_pipeline/tl/openavb_talker.h index 534114c9..6e0b0c0c 100644 --- a/lib/avtp_pipeline/tl/openavb_talker.h +++ b/lib/avtp_pipeline/tl/openavb_talker.h @@ -76,6 +76,6 @@ bool talkerStartStream(tl_state_t *pTLState); void talkerStopStream(tl_state_t *pTLState); bool openavbTLRunTalkerInit(tl_state_t *pTLState); void openavbTLRunTalkerFinish(tl_state_t *pTLState); -void openavbTLDropTalker(tl_state_t *pTLState, U32 drop_count); +void openavbTLDropTalker(tl_state_t *pTLState, int drop_count); #endif // OPENAVB_TL_TALKER_H diff --git a/lib/avtp_pipeline/tl/openavb_tl.c b/lib/avtp_pipeline/tl/openavb_tl.c index e260f679..cf58d4bf 100755 --- a/lib/avtp_pipeline/tl/openavb_tl.c +++ b/lib/avtp_pipeline/tl/openavb_tl.c @@ -763,7 +763,7 @@ EXTERN_DLL_EXPORT void openavbTLPauseStream(tl_handle_t handle, bool bPause) AVB_TRACE_EXIT(AVB_TRACE_TL); } -EXTERN_DLL_EXPORT void openavbTLDropAvtpPackets(tl_handle_t handle, U32 drop_count) +EXTERN_DLL_EXPORT void openavbTLDropAvtpPackets(tl_handle_t handle, int drop_count) { AVB_TRACE_ENTRY(AVB_TRACE_TL); diff --git a/lib/avtp_pipeline/tl/openavb_tl_pub.h b/lib/avtp_pipeline/tl/openavb_tl_pub.h index cc3715b5..3538525b 100755 --- a/lib/avtp_pipeline/tl/openavb_tl_pub.h +++ b/lib/avtp_pipeline/tl/openavb_tl_pub.h @@ -398,7 +398,7 @@ bool openavbTLReadIniFileOsal(tl_handle_t TLhandle, const char *fileName, openav * @param TLhandle Pointer to handle of talker * @param drop_count Number of packets to be dropped */ -void openavbTLDropAvtpPackets(tl_handle_t TLhandle, U32 drop_count); +void openavbTLDropAvtpPackets(tl_handle_t TLhandle, int drop_count); /** \example openavb_host.c * Talker / Listener example host application. -- cgit v1.2.1