From c8eda9662047e9b850c44e4372171d0203fbfc50 Mon Sep 17 00:00:00 2001 From: GetAway Date: Fri, 14 Jun 2019 21:03:10 +0200 Subject: [PATCH] libstb_hal: Suppress implicit-fallthrough warnings from GCC 7 --- libarmbox/hdmi_cec.cpp | 2 ++ libdvbci/dvbci_camgr.cpp | 1 + libdvbci/dvbci_ccmgr.cpp | 1 + libdvbci/dvbci_datetimemgr.cpp | 1 + libdvbci/dvbci_session.cpp | 3 ++- libeplayer3-arm/output/writer/mipsel/pcm.c | 3 +++ 6 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libarmbox/hdmi_cec.cpp b/libarmbox/hdmi_cec.cpp index c2265d7..8ebe131 100644 --- a/libarmbox/hdmi_cec.cpp +++ b/libarmbox/hdmi_cec.cpp @@ -555,8 +555,10 @@ void hdmi_cec::Receive() break; } case CEC_OPCODE_USER_CONTROL_PRESSED: /* key pressed */ + { keypressed = true; pressedkey = rxmessage.data[1]; + } // fall through case CEC_OPCODE_USER_CONTROL_RELEASE: /* key released */ { long code = translateKey(pressedkey); diff --git a/libdvbci/dvbci_camgr.cpp b/libdvbci/dvbci_camgr.cpp index 6f1264c..88ac727 100644 --- a/libdvbci/dvbci_camgr.cpp +++ b/libdvbci/dvbci_camgr.cpp @@ -85,6 +85,7 @@ int eDVBCICAManagerSession::doAction() } case stateFinal: printf("[CI CA] stateFinal and action should not happen\n"); + // fall through default: return 0; } diff --git a/libdvbci/dvbci_ccmgr.cpp b/libdvbci/dvbci_ccmgr.cpp index 932e6b1..e3bdff2 100644 --- a/libdvbci/dvbci_ccmgr.cpp +++ b/libdvbci/dvbci_ccmgr.cpp @@ -1339,6 +1339,7 @@ int eDVBCIContentControlManagerSession::doAction() } case stateFinal: printf("stateFinal und action! kann doch garnicht sein ;)\n"); + // fall through default: return 0; } diff --git a/libdvbci/dvbci_datetimemgr.cpp b/libdvbci/dvbci_datetimemgr.cpp index 26dbd79..d6206c2 100644 --- a/libdvbci/dvbci_datetimemgr.cpp +++ b/libdvbci/dvbci_datetimemgr.cpp @@ -52,6 +52,7 @@ int eDVBCIDateTimeSession::doAction() return 0; case stateFinal: printf("stateFinal und action! kann doch garnicht sein ;)\n"); + // fall through default: return 0; } diff --git a/libdvbci/dvbci_session.cpp b/libdvbci/dvbci_session.cpp index 7618526..d4fe5c3 100644 --- a/libdvbci/dvbci_session.cpp +++ b/libdvbci/dvbci_session.cpp @@ -179,11 +179,12 @@ eDVBCISession* eDVBCISession::createSession(eDVBCISlot *slot, const unsigned cha printf("[CI SESS] CC MANAGER\n"); sessions[session_nb - 1] = new eDVBCIContentControlManagerSession(slot); break; - } + } // fall through case 0x00100041: // session=new eDVBCIAuthSession; printf("[CI SESS] AuthSession\n"); // break; + // fall through case 0x00200041: default: printf("[CI SESS] unknown resource type %02x %02x %02x %02x\n", resource_identifier[0], resource_identifier[1], resource_identifier[2], resource_identifier[3]); diff --git a/libeplayer3-arm/output/writer/mipsel/pcm.c b/libeplayer3-arm/output/writer/mipsel/pcm.c index d24b4e2..30caa13 100644 --- a/libeplayer3-arm/output/writer/mipsel/pcm.c +++ b/libeplayer3-arm/output/writer/mipsel/pcm.c @@ -137,6 +137,7 @@ static int writeData(WriterAVCallData_t *call) case AV_CODEC_ID_PCM_S16LE: case AV_CODEC_ID_PCM_U16LE: LE = 1; + // fall through case AV_CODEC_ID_PCM_S16BE: case AV_CODEC_ID_PCM_U16BE: width = depth = 16; @@ -144,6 +145,7 @@ static int writeData(WriterAVCallData_t *call) case AV_CODEC_ID_PCM_S24LE: case AV_CODEC_ID_PCM_U24LE: LE = 1; + // fall through case AV_CODEC_ID_PCM_S24BE: case AV_CODEC_ID_PCM_U24BE: width = depth = 24; @@ -151,6 +153,7 @@ static int writeData(WriterAVCallData_t *call) case AV_CODEC_ID_PCM_S32LE: case AV_CODEC_ID_PCM_U32LE: LE = 1; + // fall through case AV_CODEC_ID_PCM_S32BE: case AV_CODEC_ID_PCM_U32BE: width = depth = 32;