Removed obsolete software statusline support.

diff --git a/drawing.cpp b/drawing.cpp
index 851c235b0f1940861d2ab6b54c26dc2bc9946434..92a9ea6c6fab84d5c807e53779f2a245deae6766 100644 (file)
--- a/drawing.cpp
+++ b/drawing.cpp
@@ -4207,7 +4207,6 @@ static void init_drawing_frame (void)
 }
 
 static int lightpen_y1[2], lightpen_y2[2];
-static int statusbar_y1, statusbar_y2;
 
 void putpixel(uae_u8 *buf, uae_u8 *genlockbuf, int bpp, int x, xcolnr c8)
 {
@@ -4489,21 +4488,6 @@ static void draw_frame2(struct vidbuffer *vbin, struct vidbuffer *vbout)
 
 static void draw_frame_extras(struct vidbuffer *vb, int y_start, int y_end)
 {
-       if ((currprefs.leds_on_screen & STATUSLINE_CHIPSET) && softstatusline()) {
-               int slx, sly;
-               int mult = statusline_get_multiplier(vb->monitor_id) / 100;
-               statusline_getpos(vb->monitor_id, &slx, &sly, vb->outwidth, vb->outheight);
-               statusbar_y1 = sly + min_ypos_for_screen - 1;
-               statusbar_y2 = statusbar_y1 + TD_TOTAL_HEIGHT * mult + 1;
-               draw_status_line(vb->monitor_id, sly, -1);
-               for (int i = 0; i < TD_TOTAL_HEIGHT * mult; i++) {
-                       int line = sly + i;
-                       draw_status_line(vb->monitor_id, line, i);
-               }
-       } else {
-               statusbar_y1 = 0;
-               statusbar_y1 = 0;
-       }
        if (debug_dma > 1 || debug_heatmap > 1) {
                for (int i = 0; i < vb->outheight; i++) {
                        int line = i;
@@ -4977,8 +4961,7 @@ void hsync_record_line_state (int lineno, enum nln_how how, int changed)
        state = linestate + lineno;
        changed |= ad->frame_redraw_necessary != 0 || refresh_indicator_buffer != NULL ||
                ((lineno >= lightpen_y1[0] && lineno < lightpen_y2[0]) ||
-               (lineno >= lightpen_y1[1] && lineno < lightpen_y2[1]) ||
-               (lineno >= statusbar_y1 && lineno < statusbar_y2));
+               (lineno >= lightpen_y1[1] && lineno < lightpen_y2[1]));
 
        switch (how) {
        case nln_normal:

diff --git a/framebufferboards.cpp b/framebufferboards.cpp
index fae7417b5480d4c4be7fbe87f16279388df8e08e..391884b240f169bfaad5f1348f62938dfd5dc7c3 100644 (file)
--- a/framebufferboards.cpp
+++ b/framebufferboards.cpp
@@ -67,15 +67,9 @@ static struct fb_struct *fb_last;
 static bool fb_get_surface(struct fb_struct *data)
 {
        struct amigadisplay *ad = &adisplays[data->monitor_id];
-       bool gotsurf = false;
        if (ad->picasso_on) {
                if (data->surface == NULL) {
                        data->surface = gfx_lock_picasso(data->monitor_id, false);
-                       gotsurf = true;
-               }
-               if (data->surface && gotsurf) {
-                       if (softstatusline())
-                               picasso_statusline(data->monitor_id, data->surface);
                }
        }
        return data->surface != NULL;

diff --git a/gfxboard.cpp b/gfxboard.cpp
index ef582f142f0e59342b6b3a61c78846836426ca22..c57440c5cc32994cdcba840fb82752e007b3eccd 100644 (file)
--- a/gfxboard.cpp
+++ b/gfxboard.cpp
@@ -1625,17 +1625,6 @@ void gfxboard_vsync_handler(bool full_redraw_required, bool redraw_required)
                }
 
                if (ad->picasso_on && !gb->resolutionchange) {
-                       if (!gb->monitor_id) {
-                               if (currprefs.leds_on_screen & STATUSLINE_RTG) {
-                                       if (gb->gfxboard_surface == NULL) {
-                                               gb->gfxboard_surface = gfx_lock_picasso(gb->monitor_id, false);
-                                       }
-                                       if (gb->gfxboard_surface) {
-                                               if (softstatusline())
-                                                       picasso_statusline(gb->monitor_id, gb->gfxboard_surface);
-                                       }
-                               }
-                       }
                        if (gb->fullrefresh > 0)
                                gb->fullrefresh--;
                }

diff --git a/include/statusline.h b/include/statusline.h
index 61ca16365c0cd34977c529402539f4133bbb68de..48f9790c89b14b523e5d10095a2e9d9224602593 100644 (file)
--- a/include/statusline.h
+++ b/include/statusline.h
@@ -35,7 +35,6 @@ extern int td_width;
 void draw_status_line_single(int monid, uae_u8 *buf, int bpp, int y, int totalwidth, uae_u32 *rc, uae_u32 *gc, uae_u32 *bc, uae_u32 *alpha);
 void statusline_single_erase(int monid, uae_u8 *buf, int bpp, int y, int totalwidth);
 void statusline_getpos(int monid, int *x, int *y, int width, int height);
-bool softstatusline(void);
 
 #define STATUSTYPE_FLOPPY 1
 #define STATUSTYPE_DISPLAY 2

diff --git a/mame/a2410.cpp b/mame/a2410.cpp
index 1ac271a834e02f516d625af1d040a6d3d6ef9524..11cf005a1da71b51d77fd3f1e290c47569efed79 100644 (file)
--- a/mame/a2410.cpp
+++ b/mame/a2410.cpp
@@ -673,15 +673,9 @@ static void get_a2410_surface(struct a2410_struct *data)
        int monid = currprefs.rtgboards[data->a2410_gfxboard].monitor_id;
        struct amigadisplay *ad = &adisplays[monid];
 
-       bool gotsurf = false;
        if (ad->picasso_on) {
                if (data->a2410_surface == NULL) {
                        data->a2410_surface = gfx_lock_picasso(monid, false);
-                       gotsurf = true;
-               }
-               if (data->a2410_surface && gotsurf) {
-                       if (softstatusline())
-                               picasso_statusline(monid, data->a2410_surface);
                }
        }
 }

diff --git a/od-win32/picasso96_win.cpp b/od-win32/picasso96_win.cpp
index d89236e487c1be9c791a35794bc13e30067f4efe..69e994a279029192c0265ee510880c8ab627ae12 100644 (file)
--- a/od-win32/picasso96_win.cpp
+++ b/od-win32/picasso96_win.cpp
@@ -5682,9 +5682,6 @@ static void picasso_flushpixels(int index, uae_u8 *src, int off, bool render)
                        dstp = gfx_lock_picasso(monid, false);
                }
                if (dstp) {
-                       if (softstatusline()) {
-                               picasso_statusline(monid, dstp);
-                       }
                        maxy = vidinfo->height;
                        if (miny > vidinfo->height - TD_TOTAL_HEIGHT)
                                miny = vidinfo->height - TD_TOTAL_HEIGHT;

diff --git a/od-win32/statusline_win32.cpp b/od-win32/statusline_win32.cpp
index 1520c381ff0ce1c5e02412d71dbd524e5aeda890..5117fd9fac4c0be7383f88aec4451f3db280a4da 100644 (file)
--- a/od-win32/statusline_win32.cpp
+++ b/od-win32/statusline_win32.cpp
@@ -24,11 +24,6 @@ static HPALETTE statusline_palette;
 static bool statusline_was_updated;
 static char *td_new_numbers;
 
-bool softstatusline(void)
-{
-       return false;
-}
-
 void deletestatusline(int monid)
 {
        if (monid)