dev,cpu: Make two very generic enums ScopedEnums.
authorGabe Black <gabe.black@gmail.com>
Mon, 20 Apr 2020 14:49:19 +0000 (07:49 -0700)
committerGabe Black <gabeblack@google.com>
Mon, 20 Apr 2020 22:49:11 +0000 (22:49 +0000)
commitc80b2e38118a1156c762fa58766d51e146707efa
tree4ed3ff71764d4d67641cb05babd47f7c4ad1cc3b
parenta1c502426ee9b942a04cbe9ed4c32fcf987fcd04
dev,cpu: Make two very generic enums ScopedEnums.

Two python Enum parameter types had some very generic elements which
both include one named "none". When headers for both are included that
creates a conflict which breaks the build. Enums which such extremely
generic names need to be scoped so that they don't invite these sorts
of collisions.

This change converts them from Enum to ScopedEnum in python, and also
makes a few small changes to where they're used in c++ to match.

Issue-on: https://gem5.atlassian.net/browse/GEM5-447

Change-Id: Ibda6e6cfcd700a618f8c68d174f33ec1e178b9ac
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27950
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
src/cpu/testers/traffic_gen/BaseTrafficGen.py
src/cpu/testers/traffic_gen/stream_gen.cc
src/dev/serial/Terminal.py
src/dev/serial/terminal.cc