Fix red introduced in 41d5ca3c48
Later GCC versions are apparently more permissive than older versions
when it comes to variable declarations not part of a block (ie {} that
immediately follows a case statement.
This resulted in every non-simulator device target failing to build,
along with sim build on older compilers. I should have caught this in
the review; mea culpa.
Change-Id: Id32e085e34601cca7be273ed45711a4b8ee182a0