On 8/14/20 12:25 AM, Eduardo Habkost wrote:
> The PL1110 enum value name will conflict with the PL1110 type
> cast checker, when we replace the existing macro with an inline
> function. Rename it to PL1110_STOCK.
typo s/PL1110/PL110/ in subject and description.
>
> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
> ---
> hw/display/pl110.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/hw/display/pl110.c b/hw/display/pl110.c
> index c2991a28d2..4664fde3f2 100644
> --- a/hw/display/pl110.c
> +++ b/hw/display/pl110.c
> @@ -42,7 +42,7 @@ enum pl110_bppmode
> /* The Versatile/PB uses a slightly modified PL110 controller. */
> enum pl110_version
> {
> - PL110,
> + PL110_STOCK,
> PL110_VERSATILE,
> PL111
For completeness I'd also rename PL111.
What about:
enum pl110_version
{
PL110_VERSION,
PL110_VERSATILE_VERSION,
PL111_VERSION
}
?
> };
> @@ -372,12 +372,12 @@ static uint64_t pl110_read(void *opaque, hwaddr offset,
> case 5: /* LCDLPBASE */
> return s->lpbase;
> case 6: /* LCDIMSC */
> - if (s->version != PL110) {
> + if (s->version != PL110_STOCK) {
> return s->cr;
> }
> return s->int_mask;
> case 7: /* LCDControl */
> - if (s->version != PL110) {
> + if (s->version != PL110_STOCK) {
> return s->int_mask;
> }
> return s->cr;
> @@ -437,7 +437,7 @@ static void pl110_write(void *opaque, hwaddr offset,
> s->lpbase = val;
> break;
> case 6: /* LCDIMSC */
> - if (s->version != PL110) {
> + if (s->version != PL110_STOCK) {
> goto control;
> }
> imsc:
> @@ -445,7 +445,7 @@ static void pl110_write(void *opaque, hwaddr offset,
> pl110_update(s);
> break;
> case 7: /* LCDControl */
> - if (s->version != PL110) {
> + if (s->version != PL110_STOCK) {
> goto imsc;
> }
> control:
> @@ -513,7 +513,7 @@ static void pl110_init(Object *obj)
> {
> PL110State *s = PL110(obj);
>
> - s->version = PL110;
> + s->version = PL110_STOCK;
> }
>
> static void pl110_versatile_init(Object *obj)
>
