Skip to content

Commit

Permalink
Add many missing VDP commands. (#10)
Browse files Browse the repository at this point in the history 
Add many missing VDP commands.
  • Loading branch information
@robogeek42
robogeek42 authored Mar 11, 2024
1 parent 2be775d commit 7abe3b5
Show file tree
Hide file tree
Showing 2 changed files with 220 additions and 5 deletions.
40 changes: 39 additions & 1 deletion src/libc/include/vdp_vdu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,69 @@
#include <stdint.h>
#include <mos_api.h>

#ifdef __cplusplus
extern "C" {
#endif

#define VDP_PUTS(S) mos_puts( (char *)&(S), sizeof(S), 0)

volatile SYSVAR *vdp_vdu_init( void );
void vdp_write_at_text_cursor( void );
void vdp_write_at_graphics_cursor( void );
void vdp_enable_screen( void );
void vdp_bell( void );
void vdp_cursor_left( void );
void vdp_cursor_right( void );
void vdp_cursor_down( void );
void vdp_cursor_up( void );
void vdp_cursor_up( void );
void vdp_clear_screen( void );
void vdp_page_mode_on( void );
void vdp_page_mode_off( void );
void vdp_clear_graphics( void );
void vdp_reset_graphics( void );
void vdp_disable_screen( void );
void vdp_cursor_home( void );
void vdp_cursor_tab( int row, int col );
void vdp_set_text_colour( int colour );
void vdp_set_graphics_colour( int mode, int colour );
#define vdp_gcol( M, C ) vdp_set_graphics_colour( M, C )
void vdp_define_colour (int logical, int red, int green, int blue );
void vdp_graphics_origin( int x, int y );
int vdp_mode( int mode );
void vdp_swap( void );
void vdp_get_scr_dims( bool );
void vdp_redefine_character( int chnum, uint8_t b0, uint8_t b1, uint8_t b2, uint8_t b3, uint8_t b4, uint8_t b5, uint8_t b6, uint8_t b7 );
void vdp_logical_scr_dims( bool );
void vdp_cursor_enable( bool flag );
void vdp_scroll_screen_extent( int extent, int direction, int speed );
void vdp_scroll_screen(int direction, int speed);

void vdp_reset_viewports( void );
void vdp_set_graphics_viewport( int left, int bottom, int right, int top );
void vdp_set_text_viewport( int left, int bottom, int right, int top );

void vdp_move_to( int x, int y );
void vdp_line_to( int x, int y );
void vdp_point( int x, int y );
void vdp_triangle( int x, int y );
void vdp_circle_radius( int x, int y );
void vdp_circle( int x, int y );
void vdp_filled_rect( int x, int y );

void vdp_select_bitmap( int n );
void vdp_load_bitmap( int width, int height, uint32_t *data );
int vdp_load_bitmap_file( const char *fname, int width, int height );
void vdp_solid_bitmap( int width, int height, int r, int g, int b, int a );
void vdp_draw_bitmap( int x, int y );

int vdp_load_sprite_bitmaps( const char *fname_prefix, const char *fname_format,
int width, int height, int num, int bitmap_num );
void vdp_create_sprite( int sprite, int bitmap_num, int frames );

void vdp_select_sprite( int n );
void vdp_clear_sprite( void );
void vdp_add_sprite_bitmap( int n );
void vdp_move_sprite_to( int x, int y );
void vdp_move_sprite_by( int x, int y );
void vdp_show_sprite( void );
Expand All @@ -54,4 +79,17 @@ void vdp_activate_sprites( int n );
void vdp_refresh_sprites( void );
void vdp_reset_sprites( void );

#endif
void vdp_adv_write_block(int bufferID, int length);
void vdp_adv_clear_buffer(int bufferID);
void vdp_adv_create(int bufferID, int length);
void vdp_adv_stream(int bufferID);
void vdp_adv_adjust(int bufferID, int operation, int offset);
void vdp_adv_consolidate(int bufferID);
void vdp_adv_select_bitmap(int bufferId);
void vdp_adv_bitmap_from_buffer(int width, int height, int format);
#ifdef __cplusplus
}
#endif

#endif

185 changes: 181 additions & 4 deletions src/libc/vdp_vdu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,22 @@ typedef struct { uint8_t A; uint8_t n; } VDU_A_n;
typedef struct { uint8_t A; uint8_t CMD; } VDU_A_CMD;
typedef struct { uint8_t A; uint8_t CMD; uint8_t n; } VDU_A_CMD_n;
typedef struct { uint8_t A; uint8_t c; uint8_t r; } VDU_A_c_r;
typedef struct { uint8_t A; uint8_t l; uint8_t r; uint8_t g; uint8_t b; } VDU_A_l_r_g_b;
typedef struct { uint8_t A; uint16_t x; uint16_t y; } VDU_A_x_y;
typedef struct { uint8_t A; uint8_t CMD; uint16_t x; uint16_t y; } VDU_A_CMD_x_y;
typedef struct { uint8_t A; uint8_t B; uint8_t CMD; } VDU_A_B_CMD;
typedef struct { uint8_t A; uint8_t B; uint8_t CMD; uint8_t n; } VDU_A_B_CMD_n;
typedef struct { uint8_t A; uint8_t B; uint8_t CMD; uint16_t b; } VDU_A_B_CMD_b;
typedef struct { uint8_t A; uint8_t B; uint8_t CMD; uint16_t x; uint16_t y; } VDU_A_B_CMD_x_y;
typedef struct { uint8_t A; uint8_t B; uint8_t CMD; uint16_t x; uint16_t y;
uint8_t r; uint8_t g; uint8_t b; uint8_t a; } VDU_A_B_CMD_x_y_rgba;
typedef struct { uint8_t A; uint8_t B; uint8_t CMD; uint16_t w; uint16_t h; uint8_t f; } VDU_A_B_CMD_w_h_f;

typedef struct { uint8_t A; uint8_t B; uint8_t C; uint16_t BID; uint8_t CMD; } VDU_ADV_CMD;
typedef struct { uint8_t A; uint8_t B; uint8_t C; uint16_t BID; uint8_t CMD; uint16_t ui16; } VDU_ADV_CMD_ui16;
typedef struct { uint8_t A; uint8_t B; uint8_t C; uint16_t BID; uint8_t CMD; uint8_t ui8; uint16_t ui16; } VDU_ADV_CMD_ui8_ui16;
typedef struct { uint8_t A; uint8_t B; uint8_t b0; uint8_t b1; uint8_t b2; uint8_t b3; uint8_t b4; uint8_t b5; uint8_t b6; uint8_t b7; } VDU_A_B_ui8x8;
typedef struct { uint8_t A; uint16_t w0; uint16_t w1; uint16_t w2; uint16_t w3; } VDU_A_ui16x4;

static volatile SYSVAR *sys_vars = NULL;

Expand All @@ -33,32 +42,51 @@ volatile SYSVAR *vdp_vdu_init( void )

// Basic VDU commands

static VDU_A vdu_write_at_text_cursor = { 4 };
static VDU_A vdu_write_at_graphics_cursor = { 5 };
static VDU_A vdu_enable_screen = { 6 };
static VDU_A vdu_bell = { 7 };
static VDU_A vdu_cursor_left = { 8 };
static VDU_A vdu_cursor_right = { 9 };
static VDU_A vdu_cursor_down = { 10 };
static VDU_A vdu_cursor_up = { 11 };
static VDU_A vdu_clear_screen = { 12 };
static VDU_A vdu_page_mode_on = { 14 };
static VDU_A vdu_page_mode_off = { 15 };
static VDU_A vdu_clear_graphics = { 16 };
static VDU_A_n vdu_set_text_colour = { 17, 0 };
static VDU_A_c_r vdu_set_graphics_colour = { 18, 0, 0 };
static VDU_A_l_r_g_b vdu_define_colour = { 19, 0, 0, 0, 0 };
static VDU_A vdu_reset_graphics = { 20 };
static VDU_A vdu_disable_screen = { 21 };
static VDU_A_n vdu_mode = { 22, 0 };
static VDU_A_x_y vdu_graphics_origin = { 29, 0, 0 };
static VDU_A vdu_cursor_home = { 30 };
static VDU_A_c_r vdu_cursor_tab = { 31, 0, 0 };
static VDU_A_B_CMD vdu_swap = { 23, 0, 195 };

void vdp_write_at_text_cursor( void ) { VDP_PUTS( vdu_write_at_text_cursor ); }
void vdp_write_at_graphics_cursor( void ) { VDP_PUTS( vdu_write_at_graphics_cursor ); }
void vdp_enable_screen( void ) { VDP_PUTS( vdu_enable_screen ); }
void vdp_bell( void ) { VDP_PUTS( vdu_bell ); }
void vdp_cursor_left( void ) { VDP_PUTS( vdu_cursor_left ); }
void vdp_cursor_right( void ) { VDP_PUTS( vdu_cursor_right ); }
void vdp_cursor_down( void ) { VDP_PUTS( vdu_cursor_down ); }
void vdp_cursor_up( void ) { VDP_PUTS( vdu_cursor_up ); }
void vdp_clear_screen( void ) { VDP_PUTS( vdu_clear_screen ); }
void vdp_page_mode_on( void ) { VDP_PUTS( vdu_page_mode_on ); }
void vdp_page_mode_off( void ) { VDP_PUTS( vdu_page_mode_off ); }
void vdp_clear_graphics( void ) { VDP_PUTS( vdu_clear_graphics ); }
void vdp_reset_graphics( void ) { VDP_PUTS( vdu_reset_graphics ); }
void vdp_disable_screen( void ) { VDP_PUTS( vdu_disable_screen ); }
void vdp_cursor_home( void ) { VDP_PUTS( vdu_cursor_home ); }
void vdp_swap( void ) { VDP_PUTS( vdu_swap ); }

void vdp_cursor_tab( int row, int col )
// rg: fixed this so it is X, Y
void vdp_cursor_tab( int col, int row )
{
vdu_cursor_tab.r = row;
vdu_cursor_tab.c = col;
vdu_cursor_tab.r = row;
VDP_PUTS( vdu_cursor_tab );
}

Expand All @@ -68,9 +96,25 @@ void vdp_set_text_colour( int colour )
VDP_PUTS( vdu_set_text_colour );
}

void vdp_set_graphics_colour( int mode, int colour )
{
vdu_set_graphics_colour.c = mode;
vdu_set_graphics_colour.r = colour;
VDP_PUTS( vdu_set_graphics_colour );
}

void vdp_define_colour(int logical, int red, int green, int blue )
{
vdu_define_colour.l = logical;
vdu_define_colour.r = red;
vdu_define_colour.g = green;
vdu_define_colour.b = blue;
VDP_PUTS( vdu_define_colour );
}

int vdp_mode( int mode )
{
if ( mode < 0 || mode >= 4 ) return -1;
if ( mode < 0 || mode >= 255 ) return -1;
vdu_mode.n = mode;
VDP_PUTS( vdu_mode );
return mode;
Expand All @@ -85,9 +129,25 @@ void vdp_graphics_origin( int x, int y )

// VDU 23 commands

static VDU_A_B_ui8x8 vdu_redefine_character = { 23, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
static VDU_A_B_CMD vdu_get_scr_dims = { 23, 0, 0x86 };
static VDU_A_B_CMD_n vdu_set_logical_scr_dims = { 23, 0, 0xC0, 0 };
static VDU_A_CMD_n vdu_cursor_enable = { 23, 1, 0 };
static VDU_A_l_r_g_b vdu_scroll_screen = {23, 7, 1, 0, 0};

void vdp_redefine_character( int chnum, uint8_t b0, uint8_t b1, uint8_t b2, uint8_t b3, uint8_t b4, uint8_t b5, uint8_t b6, uint8_t b7 )
{
vdu_redefine_character.B = chnum;
vdu_redefine_character.b0 = b0;
vdu_redefine_character.b1 = b1;
vdu_redefine_character.b2 = b2;
vdu_redefine_character.b3 = b3;
vdu_redefine_character.b4 = b4;
vdu_redefine_character.b5 = b5;
vdu_redefine_character.b6 = b6;
vdu_redefine_character.b7 = b7;
VDP_PUTS( vdu_redefine_character );
}

void vdp_get_scr_dims( bool wait )
{
Expand Down Expand Up @@ -115,14 +175,55 @@ void vdp_cursor_enable( bool flag )
VDP_PUTS( vdu_cursor_enable );
}

// extent 0 = current text viewport, 1 = whole screen, 2 = current graphics viewport, 3 = active viewport
void vdp_scroll_screen_extent( int extent, int direction, int speed )
{
vdu_scroll_screen.r = extent;
vdu_scroll_screen.g = direction;
vdu_scroll_screen.b = speed;
VDP_PUTS( vdu_scroll_screen );
}
void vdp_scroll_screen( int direction, int speed )
{
vdu_scroll_screen.r = 1;
vdu_scroll_screen.g = direction;
vdu_scroll_screen.b = speed;
VDP_PUTS( vdu_scroll_screen );
}

// viewport commands

static VDU_A vdu_reset_viewports = { 26 };
static VDU_A_ui16x4 vdu_set_graphics_viewport = { 24, 0, 0, 0, 0 };
static VDU_A_l_r_g_b vdu_set_text_viewport = { 28, 0, 0, 0, 0 };

void vdp_reset_viewports( void ) { VDP_PUTS( vdu_reset_viewports ); }
void vdp_set_graphics_viewport( int left, int bottom, int right, int top )
{
vdu_set_graphics_viewport.w0 = left;
vdu_set_graphics_viewport.w1 = bottom;
vdu_set_graphics_viewport.w2 = right;
vdu_set_graphics_viewport.w3 = top;
VDP_PUTS( vdu_set_graphics_viewport );
}
void vdp_set_text_viewport( int left, int bottom, int right, int top )
{
vdu_set_text_viewport.l = left;
vdu_set_text_viewport.r = bottom;
vdu_set_text_viewport.g = right;
vdu_set_text_viewport.b = top;
VDP_PUTS( vdu_set_text_viewport );
}

// VDU 25 - plot command

static VDU_A_CMD_x_y vdu_move_to = { 25, 0x04, 0, 0 };
static VDU_A_CMD_x_y vdu_line_to = { 25, 0x05, 0, 0 };
static VDU_A_CMD_x_y vdu_point = { 25, 0x40, 0, 0 };
static VDU_A_CMD_x_y vdu_point = { 25, 0x45, 0, 0 };
static VDU_A_CMD_x_y vdu_triangle = { 25, 0x50, 0, 0 };
static VDU_A_CMD_x_y vdu_circle_radius = { 25, 0x90, 0, 0 };
static VDU_A_CMD_x_y vdu_circle = { 25, 0x94, 0, 0 };
static VDU_A_CMD_x_y vdu_filled_rect = { 25, 0x65, 0, 0 };

void vdp_move_to( int x, int y )
{
Expand Down Expand Up @@ -166,6 +267,13 @@ void vdp_circle( int x, int y )
VDP_PUTS( vdu_circle );
}

void vdp_filled_rect( int x, int y )
{
vdu_filled_rect.x = x;
vdu_filled_rect.y = y;
VDP_PUTS( vdu_filled_rect );
}

// Bitmaps

static VDU_A_B_CMD_n vdu_select_bitmap = { 23, 27, 0, 0 };
Expand Down Expand Up @@ -374,3 +482,72 @@ void vdp_reset_sprites( void )
VDP_PUTS( vdu_sprite_reset );
}

/* Advanced buffered commands (selected) */

static VDU_ADV_CMD_ui16 vdu_adv_write_block = { 23, 0, 0xA0, 0xFA00, 0, 0};
static VDU_ADV_CMD vdu_adv_clear_buffer = { 23, 0, 0xA0, 0xFA00, 2};
static VDU_ADV_CMD_ui16 vdu_adv_create = { 23, 0, 0xA0, 0xFA00, 3, 0};
static VDU_ADV_CMD vdu_adv_stream = { 23, 0, 0xA0, 0xFA00, 4};
static VDU_ADV_CMD_ui8_ui16 vdu_adv_adjust = { 23, 0, 0xA0, 0xFA00, 5, 0, 0};
static VDU_ADV_CMD vdu_adv_consolidate = { 23, 0, 0xA0, 0xFA00, 14};

// VDU 23,27 - extended commands for bufferIds
static VDU_A_B_CMD_b vdu_adv_select_bitmap = { 23, 27, 0x20, 0xFA00};
static VDU_A_B_CMD_w_h_f vdu_adv_bitmap_from_buffer = { 23, 27, 0x21, 0, 0, 0};

void vdp_adv_write_block(int bufferID, int length)
{
vdu_adv_write_block.BID = bufferID;
vdu_adv_write_block.ui16 = length;
VDP_PUTS(vdu_adv_write_block);
}

void vdp_adv_clear_buffer(int bufferID)
{
vdu_adv_clear_buffer.BID = bufferID;
VDP_PUTS(vdu_adv_clear_buffer);
}

void vdp_adv_create(int bufferID, int length)
{
vdu_adv_create.BID = bufferID;
vdu_adv_create.ui16 = length;
VDP_PUTS(vdu_adv_create);
}

void vdp_adv_stream(int bufferID)
{
vdu_adv_stream.BID = bufferID;
VDP_PUTS(vdu_adv_stream);
}

/* Adjust - pass the necessary arguments this must then be followed
* by data appropriate for the operation selected */
void vdp_adv_adjust(int bufferID, int operation, int offset)
{
vdu_adv_adjust.BID = bufferID;
vdu_adv_adjust.ui8 = operation;
vdu_adv_adjust.ui16 = offset;
VDP_PUTS(vdu_adv_adjust);
}

void vdp_adv_consolidate(int bufferID)
{
vdu_adv_consolidate.BID = bufferID;
VDP_PUTS(vdu_adv_consolidate);
}

void vdp_adv_select_bitmap(int bufferID)
{
vdu_adv_select_bitmap.b = bufferID;
VDP_PUTS(vdu_adv_select_bitmap);
}

void vdp_adv_bitmap_from_buffer(int width, int height, int format)
{
vdu_adv_bitmap_from_buffer.w = width;
vdu_adv_bitmap_from_buffer.h = height;
vdu_adv_bitmap_from_buffer.f = format;
VDP_PUTS(vdu_adv_bitmap_from_buffer);
}

0 comments on commit 7abe3b5

Please sign in to comment.