sh: sm501: Adds hardware cursor feature
PATCH 1/1 sh: sm501: Adds hardware cursor feature
This patch adds hardware cursor feature to SM501 emulation, to make the graphic console more useful for qemu-sh4 users.
This patch should be applied after the patch posted a short time ago, which eliminates TABs.
Signed-off-by Shin-ichiro KAWASAKI <[email protected]>
hw/sm501.c +144 -11
@@ -435,6 +435,8 @@/* end of register definitions */ +#define SM501_HWC_WIDTH (64) +#define SM501_HWC_HEIGHT (64)/* SM501 local memory size taken from "linux/drivers/mfd/sm501.c" */ static const uint32_t sm501_mem_local_size[] = {
@@ -527,6 +529,95 @@return index; } +/** +* Check the availability of hardware cursor. +* @param crt 0 for PANEL, 1 for CRT. +*/ +static inline int is_hwc_enabled (SM501State *state,int crt) +{ +uint32_t addr = crt ? state->dc_crt_hwc_addr : state->dc_panel_hwc_addr; +return addr &0x80000000 ; +} + +/** +* Get the address which holds cursor pattern data. +* @param crt 0 for PANEL, 1 for CRT. +*/ +static inline uint32_t get_hwc_address (SM501State *state,int crt) +{ +uint32_t addr = crt ? state->dc_crt_hwc_addr : state->dc_panel_hwc_addr; +return (addr &0x03FFFFF0 )/* >> 4*/ ; +} + +/** +* Get the cursor position in y coordinate. +* @param crt 0 for PANEL, 1 for CRT. +*/ +static inline uint32_t get_hwc_y (SM501State *state,int crt) +{ +uint32_t location = crt ? state->dc_crt_hwc_location + : state->dc_panel_hwc_location; +return (location &0x07FF0000 ) >>16 ; +} + +/** +* Get the cursor position in x coordinate. +* @param crt 0 for PANEL, 1 for CRT. +*/ +static inline uint32_t get_hwc_x (SM501State *state,int crt) +{ +uint32_t location = crt ? state->dc_crt_hwc_location + : state->dc_panel_hwc_location; +return location &0x000007FF ; +} + +/** +* Get the cursor position in x coordinate. +* @param crt 0 for PANEL, 1 for CRT. +* @param index 0, 1, 2 or 3 which specifies color of corsor dot. +*/ +static inline uint16_t get_hwc_color (SM501State *state,int crt,int index) +{ +uint16_t color_reg =0 ; +uint16_t color_565 =0 ; + +if (index ==0 ) { +return 0 ; + } + +switch (index) { +case 1 : +case 2 : + color_reg = crt ? state->dc_crt_hwc_color_1_2 + : state->dc_panel_hwc_color_1_2; +break ; +case 3 : + color_reg = crt ? state->dc_crt_hwc_color_3 + : state->dc_panel_hwc_color_3; +break ; +default : +printf ("invalid hw cursor color.\n" ); +assert (0 ); + } + +switch (index) { +case 1 : +case 3 : + color_565 = (uint16_t )(color_reg &0xFFFF ); +break ; +case 2 : + color_565 = (uint16_t )((color_reg >>16 ) &0xFFFF ); +break ; + } +return color_565; +} + +static int within_hwc_y_range (SM501State *state,int y,int crt) +{ +int hwc_y =get_hwc_y (state, crt); +return (hwc_y <= y && y < hwc_y +SM501_HWC_HEIGHT ); +} +static uint32_t sm501_system_config_read (void *opaque,target_phys_addr_t addr) {SM501State * s = (SM501State *)opaque;
@@ -737,13 +828,13 @@ ret = s->dc_crt_hwc_addr;break ;case SM501_DC_CRT_HWC_LOC : - ret = s->dc_crt_hwc_addr; + ret = s->dc_crt_hwc_location;break ;case SM501_DC_CRT_HWC_COLOR_1_2 : - ret = s->dc_crt_hwc_addr; + ret = s->dc_crt_hwc_color_1_2;break ;case SM501_DC_CRT_HWC_COLOR_3 : - ret = s->dc_crt_hwc_addr; + ret = s->dc_crt_hwc_color_3;break ; case SM501_DC_PANEL_PALETTE ... SM501_DC_PANEL_PALETTE + 0x400*3 - 4:
@@ -810,13 +901,13 @@ s->dc_panel_hwc_addr = value &0x8FFFFFF0 ;break ;case SM501_DC_PANEL_HWC_LOC : - s->dc_panel_hwc_addr = value &0x0FFF0FFF ; + s->dc_panel_hwc_location = value &0x0FFF0FFF ;break ;case SM501_DC_PANEL_HWC_COLOR_1_2 : - s->dc_panel_hwc_addr = value; + s->dc_panel_hwc_color_1_2 = value;break ;case SM501_DC_PANEL_HWC_COLOR_3 : - s->dc_panel_hwc_addr = value &0x0000FFFF ; + s->dc_panel_hwc_color_3 = value &0x0000FFFF ;break ;case SM501_DC_CRT_CONTROL :
@@ -845,13 +936,13 @@ s->dc_crt_hwc_addr = value &0x8FFFFFF0 ;break ;case SM501_DC_CRT_HWC_LOC : - s->dc_crt_hwc_addr = value &0x0FFF0FFF ; + s->dc_crt_hwc_location = value &0x0FFF0FFF ;break ;case SM501_DC_CRT_HWC_COLOR_1_2 : - s->dc_crt_hwc_addr = value; + s->dc_crt_hwc_color_1_2 = value;break ;case SM501_DC_CRT_HWC_COLOR_3 : - s->dc_crt_hwc_addr = value &0x0000FFFF ; + s->dc_crt_hwc_color_3 = value &0x0000FFFF ;break ; case SM501_DC_PANEL_PALETTE ... SM501_DC_PANEL_PALETTE + 0x400*3 - 4:
@@ -884,6 +975,9 @@typedef void draw_line_func (uint8_t *d,const uint8_t *s,int width,const uint32_t *pal); +typedef void draw_hwc_line_func (SM501State * s,int crt,uint8_t * palette, +int c_y,uint8_t *d,int width); +#define DEPTH 8#include "sm501_template.h"
@@ -938,6 +1032,16 @@ draw_line32_16bgr, }; +static draw_hwc_line_func * draw_hwc_line_funcs[] = { + draw_hwc_line_8, + draw_hwc_line_15, + draw_hwc_line_16, + draw_hwc_line_32, + draw_hwc_line_32bgr, + draw_hwc_line_15bgr, + draw_hwc_line_16bgr, +}; +static inline int get_depth_index (DisplayState *s) {switch (ds_get_bits_per_pixel (s)) {
@@ -967,8 +1071,10 @@int dst_bpp =ds_get_bytes_per_pixel (s->ds) + (ds_get_bits_per_pixel (s->ds) %8 ?1 :0 );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 (s->ds);draw_line_func * draw_line =NULL ; +draw_hwc_line_func * draw_hwc_line =NULL ;int full_update =0 ;int y_start =-1 ;int page_min =0x7fffffff ;
@@ -996,6 +1102,22 @@break ; } +/* set up to draw hardware cursor */ +if (is_hwc_enabled (s,1 )) { +int i; + +/* get cursor palette */ +for (i =0 ; i <3 ; i++) { +uint16_t rgb565 =get_hwc_color (s,1 , i +1 ); + hwc_palette[i *3 +0 ] = (rgb565 &0xf800 ) >>8 ;/* red */ + hwc_palette[i *3 +1 ] = (rgb565 &0x07e0 ) >>3 ;/* green */ + hwc_palette[i *3 +2 ] = (rgb565 &0x001f ) <<3 ;/* blue */ + } + +/* choose cursor draw line function */ + draw_hwc_line = draw_hwc_line_funcs[ds_depth_index]; + } +/* adjust console size */ if (s->last_width != width || s->last_height != height) {qemu_console_resize (s->ds, width, height);
@@ -1006,7 +1128,8 @@/* draw each line according to conditions */ for (y =0 ; y < height; y++) { -int update = full_update; +int update_hwc = draw_hwc_line ?within_hwc_y_range (s, y,1 ) :0 ; +int update = full_update || update_hwc;ram_addr_t page0 = offset &TARGET_PAGE_MASK ;ram_addr_t page1 = (offset + width * src_bpp -1 ) &TARGET_PAGE_MASK ;ram_addr_t page;
@@ -1018,13 +1141,23 @@/* draw line and change status */ if (update) { -draw_line (&(ds_get_data (s->ds)[y * width * dst_bpp]), src, width, palette); +uint8_t * d = &(ds_get_data (s->ds)[y * width * dst_bpp]); + +/* draw graphics layer */ +draw_line (d, src, width, palette); + +/* draw haredware cursor */ +if (update_hwc) { +draw_hwc_line (s,1 , hwc_palette, y -get_hwc_y (s,1 ), d, width); + } +if (y_start <0 ) y_start = y;if (page0 < page_min) page_min = page0;if (page1 > page_max) page_max = page1; + }else {if (y_start >=0 ) {/* flush to display */
hw/sm501_template.h +42 -0
48 lines not on this page · raw message