// TODO:
// * review correctness of converted asm by comparing with RBIL
-// * refactor redundant code into sub-functions
-// * See if there is a method to the in/out stuff that can be encapsulated.
-// * remove "biosfn" prefixes
-// * verify all funcs static
//
// * convert vbe/clext code
#define SET_VGA(var, val) SET_FARVAR(get_global_seg(), (var), (val))
+
+/****************************************************************
+ * Helper functions
+ ****************************************************************/
+
static inline void
call16_vgaint(u32 eax, u32 ebx)
{
}
static void
-biosfn_perform_gray_scale_summing(u16 start, u16 count)
+perform_gray_scale_summing(u16 start, u16 count)
{
vgahw_screen_disable();
int i;
}
static void
-biosfn_set_cursor_shape(u8 CH, u8 CL)
+set_cursor_shape(u8 start, u8 end)
{
- CH &= 0x3f;
- CL &= 0x1f;
+ start &= 0x3f;
+ end &= 0x1f;
- u16 curs = (CH << 8) + CL;
+ u16 curs = (start << 8) + end;
SET_BDA(cursor_type, curs);
u8 modeset_ctl = GET_BDA(modeset_ctl);
u16 cheight = GET_BDA(char_height);
- if ((modeset_ctl & 0x01) && (cheight > 8) && (CL < 8) && (CH < 0x20)) {
- if (CL != (CH + 1))
- CH = ((CH + 1) * cheight / 8) - 1;
+ if ((modeset_ctl & 0x01) && (cheight > 8) && (end < 8) && (start < 0x20)) {
+ if (end != (start + 1))
+ start = ((start + 1) * cheight / 8) - 1;
else
- CH = ((CL + 1) * cheight / 8) - 2;
- CL = ((CL + 1) * cheight / 8) - 1;
+ start = ((end + 1) * cheight / 8) - 2;
+ end = ((end + 1) * cheight / 8) - 1;
}
- vgahw_set_cursor_shape(CH, CL);
+ vgahw_set_cursor_shape(start, end);
}
static u16
-biosfn_get_cursor_shape(u8 page)
+get_cursor_shape(u8 page)
{
if (page > 7)
return 0;
}
static void
-biosfn_set_active_page(u8 page)
+set_active_page(u8 page)
{
if (page > 7)
return;
set_cursor_pos(cp);
}
-static struct cursorpos
-write_teletype(struct cursorpos cp, struct carattr ca)
+static void
+set_scan_lines(u8 lines)
+{
+ vgahw_set_scan_lines(lines);
+ if (lines == 8)
+ set_cursor_shape(0x06, 0x07);
+ else
+ set_cursor_shape(lines - 4, lines - 3);
+ SET_BDA(char_height, lines);
+ u16 vde = vgahw_get_vde();
+ u8 rows = vde / lines;
+ SET_BDA(video_rows, rows - 1);
+ u16 cols = GET_BDA(video_cols);
+ SET_BDA(video_pagesize, rows * cols * 2);
+}
+
+
+/****************************************************************
+ * Character writing
+ ****************************************************************/
+
+// Scroll the screen one line. This function is designed to be called
+// tail-recursive to reduce stack usage.
+static void noinline
+scroll_one(u16 nbrows, u16 nbcols, u8 page)
+{
+ struct cursorpos ul = {0, 0, page};
+ struct cursorpos lr = {nbcols-1, nbrows-1, page};
+ vgafb_scroll(1, -1, ul, lr);
+}
+
+// Write a character to the screen at a given position. Implement
+// special characters and scroll the screen if necessary.
+static void
+write_teletype(struct cursorpos *pcp, struct carattr ca)
{
+ struct cursorpos cp = *pcp;
+
// Get the dimensions
u16 nbrows = GET_BDA(video_rows) + 1;
u16 nbcols = GET_BDA(video_cols);
cp.y++;
}
// Do we need to scroll ?
- if (cp.y == nbrows) {
- struct cursorpos ul = {0, 0, cp.page};
- struct cursorpos lr = {nbcols-1, nbrows-1, cp.page};
- vgafb_scroll(1, -1, ul, lr);
- cp.y--;
+ if (cp.y < nbrows) {
+ *pcp = cp;
+ return;
}
-
- return cp;
+ // Scroll screen
+ cp.y--;
+ *pcp = cp;
+ scroll_one(nbrows, nbcols, cp.page);
}
+// Write out a buffer of alternating characters and attributes.
static void
-write_string(struct cursorpos cp, u8 flag, u8 attr, u16 count,
- u16 seg, u8 *offset_far)
+write_attr_string(struct cursorpos *pcp, u16 count, u16 seg, u8 *offset_far)
{
while (count--) {
u8 car = GET_FARVAR(seg, *offset_far);
offset_far++;
- if (flag & 0x02) {
- attr = GET_FARVAR(seg, *offset_far);
- offset_far++;
- }
+ u8 attr = GET_FARVAR(seg, *offset_far);
+ offset_far++;
struct carattr ca = {car, attr, 1};
- cp = write_teletype(cp, ca);
+ write_teletype(pcp, ca);
}
-
- if (flag & 0x01)
- set_cursor_pos(cp);
}
+// Write out a buffer of characters.
static void
-set_scan_lines(u8 lines)
+write_string(struct cursorpos *pcp, u8 attr, u16 count, u16 seg, u8 *offset_far)
{
- vgahw_set_scan_lines(lines);
- if (lines == 8)
- biosfn_set_cursor_shape(0x06, 0x07);
- else
- biosfn_set_cursor_shape(lines - 4, lines - 3);
- SET_BDA(char_height, lines);
- u16 vde = vgahw_get_vde();
- u8 rows = vde / lines;
- SET_BDA(video_rows, rows - 1);
- u16 cols = GET_BDA(video_cols);
- SET_BDA(video_pagesize, rows * cols * 2);
+ while (count--) {
+ u8 car = GET_FARVAR(seg, *offset_far);
+ offset_far++;
+
+ struct carattr ca = {car, attr, 1};
+ write_teletype(pcp, ca);
+ }
}
+
+/****************************************************************
+ * Save and restore bda state
+ ****************************************************************/
+
static void
-biosfn_save_bda_state(u16 seg, struct saveBDAstate *info)
+save_bda_state(u16 seg, struct saveBDAstate *info)
{
SET_FARVAR(seg, info->video_mode, GET_BDA(video_mode));
SET_FARVAR(seg, info->video_cols, GET_BDA(video_cols));
SET_FARVAR(seg, info->video_pagestart, GET_BDA(video_pagestart));
SET_FARVAR(seg, info->video_page, GET_BDA(video_page));
/* current font */
- SET_FARVAR(seg, *(u32*)&info->font0_off, GET_IVT(0x1f).segoff);
- SET_FARVAR(seg, *(u32*)&info->font1_off, GET_IVT(0x43).segoff);
+ SET_FARVAR(seg, info->font0, GET_IVT(0x1f));
+ SET_FARVAR(seg, info->font1, GET_IVT(0x43));
}
static void
-biosfn_restore_bda_state(u16 seg, struct saveBDAstate *info)
+restore_bda_state(u16 seg, struct saveBDAstate *info)
{
SET_BDA(video_mode, GET_FARVAR(seg, info->video_mode));
SET_BDA(video_cols, GET_FARVAR(seg, info->video_cols));
SET_BDA(video_pagestart, GET_FARVAR(seg, info->video_pagestart));
SET_BDA(video_page, GET_FARVAR(seg, info->video_page));
/* current font */
- SET_IVT(0x1f, GET_FARVAR(seg, info->font0_seg)
- , GET_FARVAR(seg, info->font0_off));
- SET_IVT(0x43, GET_FARVAR(seg, info->font1_seg)
- , GET_FARVAR(seg, info->font1_off));
+ SET_IVT(0x1f, GET_FARVAR(seg, info->font0));
+ SET_IVT(0x43, GET_FARVAR(seg, info->font1));
}
}
if ((modeset_ctl & 0x02) == 0x02)
- biosfn_perform_gray_scale_summing(0x00, 0x100);
+ perform_gray_scale_summing(0x00, 0x100);
}
struct VideoParam_s *vparam_g = GET_GLOBAL(vmode_g->vparam);
// FIXME We nearly have the good tables. to be reworked
SET_BDA(dcc_index, 0x08); // 8 is VGA should be ok for now
- SET_BDA(video_savetable_ptr, (u32)video_save_pointer_table);
- SET_BDA(video_savetable_seg, get_global_seg());
+ SET_BDA(video_savetable
+ , SEGOFF(get_global_seg(), (u32)video_save_pointer_table));
// FIXME
SET_BDA(video_msr, 0x00); // Unavailable on vanilla vga, but...
// Set cursor shape
if (GET_GLOBAL(vmode_g->memmodel) & TEXT)
- biosfn_set_cursor_shape(0x06, 0x07);
+ set_cursor_shape(0x06, 0x07);
// Set cursor pos for page 0..7
int i;
for (i = 0; i < 8; i++) {
}
// Set active page 0
- biosfn_set_active_page(0x00);
+ set_active_page(0x00);
// Write the fonts in memory
if (GET_GLOBAL(vmode_g->memmodel) & TEXT) {
call16_vgaint(0x1103, 0);
}
// Set the ints 0x1F and 0x43
- SET_IVT(0x1f, get_global_seg(), (u32)&vgafont8[128 * 8]);
+ SET_IVT(0x1f, SEGOFF(get_global_seg(), (u32)&vgafont8[128 * 8]));
switch (cheight) {
case 8:
- SET_IVT(0x43, get_global_seg(), (u32)vgafont8);
+ SET_IVT(0x43, SEGOFF(get_global_seg(), (u32)vgafont8));
break;
case 14:
- SET_IVT(0x43, get_global_seg(), (u32)vgafont14);
+ SET_IVT(0x43, SEGOFF(get_global_seg(), (u32)vgafont14));
break;
case 16:
- SET_IVT(0x43, get_global_seg(), (u32)vgafont16);
+ SET_IVT(0x43, SEGOFF(get_global_seg(), (u32)vgafont16));
break;
}
}
static void
handle_1001(struct bregs *regs)
{
- biosfn_set_cursor_shape(regs->ch, regs->cl);
+ set_cursor_shape(regs->ch, regs->cl);
}
static void
static void
handle_1003(struct bregs *regs)
{
- regs->cx = biosfn_get_cursor_shape(regs->bh);
+ regs->cx = get_cursor_shape(regs->bh);
struct cursorpos cp = get_cursor_pos(regs->bh);
regs->dl = cp.x;
regs->dh = cp.y;
static void
handle_1005(struct bregs *regs)
{
- biosfn_set_active_page(regs->al);
+ set_active_page(regs->al);
}
static void
regs->ah = ca.attr;
}
-static void
+static void noinline
write_chars(u8 page, struct carattr ca, u16 count)
{
struct cursorpos cp = get_cursor_pos(page);
static void
handle_100c(struct bregs *regs)
{
- // XXX - inline
- biosfn_write_pixel(regs->bh, regs->al, regs->cx, regs->dx);
+ // XXX - page (regs->bh) is unused
+ vgafb_write_pixel(regs->al, regs->cx, regs->dx);
}
static void
handle_100d(struct bregs *regs)
{
- // XXX - inline
- biosfn_read_pixel(regs->bh, regs->cx, regs->dx, ®s->ax);
+ // XXX - page (regs->bh) is unused
+ regs->al = vgafb_read_pixel(regs->cx, regs->dx);
}
-static void
+static void noinline
handle_100e(struct bregs *regs)
{
// Ralf Brown Interrupt list is WRONG on bh(page)
// We do output only on the current page !
struct carattr ca = {regs->al, regs->bl, 0};
struct cursorpos cp = get_cursor_pos(0xff);
- cp = write_teletype(cp, ca);
+ write_teletype(&cp, ca);
set_cursor_pos(cp);
}
vgahw_get_all_palette_reg(regs->es, (u8*)(regs->dx + 0));
}
-static void
+static void noinline
handle_101010(struct bregs *regs)
{
u8 rgb[3] = {regs->dh, regs->ch, regs->cl};
vgahw_select_video_dac_color_page(regs->bl, regs->bh);
}
-static void
+static void noinline
handle_101015(struct bregs *regs)
{
u8 rgb[3];
static void
handle_10101b(struct bregs *regs)
{
- biosfn_perform_gray_scale_summing(regs->bx, regs->cx);
+ perform_gray_scale_summing(regs->bx, regs->cx);
}
static void
{
switch (regs->bh) {
case 0x00: {
- u32 segoff = GET_IVT(0x1f).segoff;
- regs->es = segoff >> 16;
- regs->bp = segoff;
+ struct segoff_s so = GET_IVT(0x1f);
+ regs->es = so.seg;
+ regs->bp = so.offset;
break;
}
case 0x01: {
- u32 segoff = GET_IVT(0x43).segoff;
- regs->es = segoff >> 16;
- regs->bp = segoff;
+ struct segoff_s so = GET_IVT(0x43);
+ regs->es = so.seg;
+ regs->bp = so.offset;
break;
}
case 0x02:
}
-static void
+// Write string
+static void noinline
handle_1013(struct bregs *regs)
{
struct cursorpos cp = {regs->dl, regs->dh, regs->bh};
// if row=0xff special case : use current cursor position
if (cp.y == 0xff)
cp = get_cursor_pos(cp.page);
- write_string(cp, regs->al, regs->bl, regs->cx
- , regs->es, (void*)(regs->bp + 0));
+ u8 flag = regs->al;
+ if (flag & 2)
+ write_attr_string(&cp, regs->cx, regs->es, (void*)(regs->bp + 0));
+ else
+ write_string(&cp, regs->bl, regs->cx, regs->es, (void*)(regs->bp + 0));
+
+ if (flag & 1)
+ set_cursor_pos(cp);
}
SET_FARVAR(seg, info->static_functionality_seg, get_global_seg());
// Hard coded copy from BIOS area. Should it be cleaner ?
- memcpy_far(seg, info->bda_0x49, SEG_BDA, (void*)0x49, 30);
- memcpy_far(seg, info->bda_0x84, SEG_BDA, (void*)0x84, 3);
+ memcpy_far(seg, info->bda_0x49, SEG_BDA, (void*)0x49
+ , sizeof(info->bda_0x49));
+ memcpy_far(seg, info->bda_0x84, SEG_BDA, (void*)0x84
+ , sizeof(info->bda_0x84));
SET_FARVAR(seg, info->dcc_index, GET_BDA(dcc_index));
SET_FARVAR(seg, info->colors, 16);
data += sizeof(struct saveVideoHardware);
}
if (flags & 2) {
- biosfn_save_bda_state(seg, data);
+ save_bda_state(seg, data);
data += sizeof(struct saveBDAstate);
}
if (flags & 4)
data += sizeof(struct saveVideoHardware);
}
if (flags & 2) {
- biosfn_restore_bda_state(seg, data);
+ restore_bda_state(seg, data);
data += sizeof(struct saveBDAstate);
}
if (flags & 4)
****************************************************************/
static void
-init_bios_area()
+init_bios_area(void)
{
// init detected hardware BIOS Area
// set 80x25 color (not clear from RBIL but usual)
vbe_init();
extern void entry_10(void);
- SET_IVT(0x10, get_global_seg(), (u32)entry_10);
+ SET_IVT(0x10, SEGOFF(get_global_seg(), (u32)entry_10));
if (CONFIG_CIRRUS)
cirrus_init();
projects / seabios.git / blobdiff