Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-20 21:56:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

i386/pc386/VGA: fix lost curly bracket and silence warnings

Browse Source 
The code seems to be broken for years.
Tested to work on real hardware (AMD Athlon) booted
over pxelinux in preparation for CAN stack test
with original Philips/NXP SJA1000 chips.

RTEMS configured with with

  RTEMS_POSIX_API = True
  BSP_ENABLE_COM1_COM4 = True
  USE_COM1_AS_CONSOLE = False
  USE_VBE_RM = False
  USE_CIRRUS_GD5446 = False

Signed-off-by: Pavel Pisa <ppisa@pikron.com>
This commit is contained in:
Pavel Pisa
2026-02-27 21:34:23 +00:00
committed by Gedare Bloom
parent 42df15b27d
commit 85b155e596
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bsps/i386/pc386/console/fb_vga.c
+20 -5
View File
@@ -75,6 +75,8 @@ rtems_device_driver frame_buffer_initialize(
void *arg
)
{
(void) minor;
(void) arg;
rtems_status_code status;
printk( "FBVGA -- driver initializing..\n" );
@@ -103,6 +105,9 @@ rtems_device_driver frame_buffer_open(
void *arg
)
{
(void) major;
(void) minor;
(void) arg;
if (_Atomic_Flag_test_and_set(&driver_mutex, ATOMIC_ORDER_ACQUIRE) != 0 ) {
/* restore previous state. for VGA this means return to text mode.
* leave out if graphics hardware has been initialized in
@@ -125,6 +130,9 @@ rtems_device_driver frame_buffer_close(
void *arg
)
{
(void) major;
(void) minor;
(void) arg;
_Atomic_Flag_clear(&driver_mutex, ATOMIC_ORDER_RELEASE);
/* restore previous state. for VGA this means return to text mode.
* leave out if graphics hardware has been initialized in
@@ -132,6 +140,7 @@ rtems_device_driver frame_buffer_close(
ega_hwterm();
printk( "FBVGA close called.\n" );
return RTEMS_SUCCESSFUL;
}
/*
* fbvga device driver READ entry point.
@@ -142,6 +151,8 @@ rtems_device_driver frame_buffer_read(
void *arg
)
{
(void) major;
(void) minor;
rtems_libio_rw_args_t *rw_args = (rtems_libio_rw_args_t *)arg;
rw_args->bytes_moved = ((rw_args->offset + rw_args->count) > fb_fix.smem_len ) ? (fb_fix.smem_len - rw_args->offset) : rw_args->count;
memcpy(rw_args->buffer, (const void *) (fb_fix.smem_start + rw_args->offset), rw_args->bytes_moved);
@@ -157,25 +168,27 @@ rtems_device_driver frame_buffer_write(
void *arg
)
{
(void) major;
(void) minor;
rtems_libio_rw_args_t *rw_args = (rtems_libio_rw_args_t *)arg;
rw_args->bytes_moved = ((rw_args->offset + rw_args->count) > fb_fix.smem_len ) ? (fb_fix.smem_len - rw_args->offset) : rw_args->count;
memcpy( (void *) (fb_fix.smem_start + rw_args->offset), rw_args->buffer, rw_args->bytes_moved);
return RTEMS_SUCCESSFUL;
}
static int get_fix_screen_info( struct fb_fix_screeninfo *info )
static inline int get_fix_screen_info( struct fb_fix_screeninfo *info )
{
*info = fb_fix;
return 0;
}
static int get_var_screen_info( struct fb_var_screeninfo *info )
static inline int get_var_screen_info( struct fb_var_screeninfo *info )
{
*info = fb_var;
return 0;
}
static int get_palette( struct fb_cmap *cmap )
static inline int get_palette( struct fb_cmap *cmap )
{
uint32_t i;
@@ -190,7 +203,7 @@ static int get_palette( struct fb_cmap *cmap )
return 0;
}
static int set_palette( struct fb_cmap *cmap )
static inline int set_palette( struct fb_cmap *cmap )
{
uint32_t i;
@@ -215,9 +228,11 @@ rtems_device_driver frame_buffer_control(
void *arg
)
{
(void) major;
(void) minor;
rtems_libio_ioctl_args_t *args = arg;
printk( "FBVGA ioctl called, cmd=%x\n", args->command );
printk( "FBVGA ioctl called, cmd=%x\n", (int)args->command );
switch( args->command ) {
case FBIOGET_FSCREENINFO: