Commit 01d2d584 authored by BALATON Zoltan's avatar BALATON Zoltan Committed by Peter Maydell
Browse files

sm501: Misc clean ups 



- Rename a variable
- Move variable declarations out of loop to the beginning in draw_hwc_line

Signed-off-by: default avatarBALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Tested-by: default avatarAurelien Jarno <aurelien@aurel32.net>
Message-id: 187c9e4e09d9bc2967b2454b36bb088ceef0b8bc.1492787889.git.balaton@eik.bme.hu
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 6a2a5aae

hw/display/sm501.c

+5 −5
Original line number Diff line number Diff line
@@ -1313,7 +1313,7 @@ static void sm501_draw_crt(SM501State *s) 
    uint32_t *palette = (uint32_t *)&s->dc_palette[SM501_DC_CRT_PALETTE -

                                                   SM501_DC_PANEL_PALETTE];

    uint8_t hwc_palette[3 * 3];

    int ds_depth_index = get_depth_index(surface);

    int dst_depth_index = get_depth_index(surface);

    draw_line_func *draw_line = NULL;

    draw_hwc_line_func *draw_hwc_line = NULL;

    int full_update = 0;
@@ -1325,13 +1325,13 @@ static void sm501_draw_crt(SM501State *s) 
    /* choose draw_line function */

    switch (src_bpp) {

    case 1:

        draw_line = draw_line8_funcs[ds_depth_index];

        draw_line = draw_line8_funcs[dst_depth_index];

        break;

    case 2:

        draw_line = draw_line16_funcs[ds_depth_index];

        draw_line = draw_line16_funcs[dst_depth_index];

        break;

    case 4:

        draw_line = draw_line32_funcs[ds_depth_index];

        draw_line = draw_line32_funcs[dst_depth_index];

        break;

    default:

        printf("sm501 draw crt : invalid DC_CRT_CONTROL=%x.\n",
@@ -1343,7 +1343,7 @@ static void sm501_draw_crt(SM501State *s) 
    /* set up to draw hardware cursor */

    if (is_hwc_enabled(s, 1)) {

        /* choose cursor draw line function */

        draw_hwc_line = draw_hwc_line_funcs[ds_depth_index];

        draw_hwc_line = draw_hwc_line_funcs[dst_depth_index];

        hwc_src = get_hwc_address(s, 1);

        c_x = get_hwc_x(s, 1);

        c_y = get_hwc_y(s, 1);

hw/display/sm501_template.h

+4 −6
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static void glue(draw_hwc_line_, PIXEL_NAME)(uint8_t *d, const uint8_t *s, 
                 int width, const uint8_t *palette, int c_x, int c_y)

{

    int i;

    uint8_t bitset = 0;

    uint8_t r, g, b, v, bitset = 0;



    /* get cursor position */

    assert(0 <= c_y && c_y < SM501_HWC_HEIGHT);
@@ -104,8 +104,6 @@ static void glue(draw_hwc_line_, PIXEL_NAME)(uint8_t *d, const uint8_t *s, 
    d += c_x * BPP;



    for (i = 0; i < SM501_HWC_WIDTH && c_x + i < width; i++) {

        uint8_t v;



        /* get pixel value */

        if (i % 4 == 0) {

            bitset = ldub_p(s);
@@ -117,9 +115,9 @@ static void glue(draw_hwc_line_, PIXEL_NAME)(uint8_t *d, const uint8_t *s, 
        /* write pixel */

        if (v) {

            v--;

            uint8_t r = palette[v * 3 + 0];

            uint8_t g = palette[v * 3 + 1];

            uint8_t b = palette[v * 3 + 2];

            r = palette[v * 3 + 0];

            g = palette[v * 3 + 1];

            b = palette[v * 3 + 2];

            *(PIXEL_TYPE *)d = glue(rgb_to_pixel, PIXEL_NAME)(r, g, b);

        }

        d += BPP;