foo

diff --git a/click-s8_mono.pcm b/click-s8_mono.pcm
deleted file mode 100644 (file)
index dbcb52d..0000000
--- a/click-s8_mono.pcm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:23c9a22ab691a84b45e3d0c866d94b167866901ceb064327420b5d4a4a839159
-size 11155

diff --git a/src/kmain.c b/src/kmain.c
index 8af7cc3..ad76287 100644 (file)
--- a/src/kmain.c
+++ b/src/kmain.c
@@ -26,12 +26,16 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "timer.h"
 #include "contty.h"
 #include "video.h"
+#include "vbe.h"
 #include "audio.h"
-#include "pci.h"
-#include "vbetest.h"
+#include "panic.h"
 
+static int video_init(void);
+static int modecmp(const void *a, const void *b);
+
+static struct video_mode vmode;
+static void *fbptr;
 
-void logohack(void);
 
 void pcboot_main(void)
 {
@@ -44,8 +48,6 @@ void pcboot_main(void)
 
        init_mem();
 
-       init_pci();
-
        /* initialize the timer */
        init_timer();
 
@@ -55,30 +57,87 @@ void pcboot_main(void)
 
        printf("PCBoot kernel initialized\n");
 
+       if(video_init() == -1) {
+               panic("Failed to find suitable video mode");
+       }
+
        for(;;) {
-               int c;
-
-               halt_cpu();
-               while((c = kb_getkey()) >= 0) {
-                       switch(c) {
-                       case KB_F1:
-                               set_vga_mode(0x13);
-                               logohack();
-                               set_vga_mode(3);
-                               break;
+               wait_vsync();
+               memset(fbptr, 0x80, vmode.width * vmode.height * vmode.bpp / 8);
+       }
+}
+
+static int video_init(void)
+{
+       struct vbe_edid edid;
+       struct video_mode vinf, *vmodes;
+       int i, xres, yres, nmodes, mode_idx = -1;
+       const char *vendor;
+
+       if(mode_idx == -1 && (vendor = get_video_vendor()) && strstr(vendor, "SeaBIOS")) {
+               mode_idx = find_video_mode_idx(800, 600, 0);
+       }
+
+       if(mode_idx == -1 && vbe_get_edid(&edid) == 0 && edid_preferred_resolution(&edid, &xres, &yres) == 0) {
+               printf("EDID: preferred resolution: %dx%d\n", xres, yres);
+               mode_idx = find_video_mode_idx(xres, yres, 0);
+       }
+
+       nmodes = video_mode_count();
+       if(!(vmodes = malloc(nmodes * sizeof *vmodes))) {
+               printf("failed to allocate video modes array (%d modes)\n", nmodes);
+               return -1;
+       }
 
-                       case KB_F2:
-                               vbetest();
+       for(i=0; i<nmodes; i++) {
+               video_mode_info(i, &vinf);
+               vmodes[i] = vinf;
+       }
+
+       if(mode_idx >= 0) {
+               if(!(fbptr = set_video_mode(vmodes[mode_idx].mode))) {
+                       printf("failed to set video mode: %x (%dx%d %dbpp)\n", mode_idx,
+                                       vmodes[mode_idx].width, vmodes[mode_idx].height, vmodes[mode_idx].bpp);
+                       mode_idx = -1;
+               } else {
+                       vmode = vmodes[mode_idx];
+                       printf("video mode: %x (%dx%d %dbpp)\n", vmode.mode, vmode.width,
+                                       vmode.height, vmode.bpp);
+               }
+       }
+
+       if(mode_idx == -1) {
+               qsort(vmodes, nmodes, sizeof *vmodes, modecmp);
+
+               for(i=0; i<nmodes; i++) {
+                       if((fbptr = set_video_mode(vmodes[i].mode))) {
+                               vmode = vmodes[i];
+                               printf("video mode: %x (%dx%d %dbpp)\n", vmode.mode, vmode.width,
+                                               vmode.height, vmode.bpp);
                                break;
                        }
-                       if(isprint(c)) {
-                               printf("key: %d '%c'\n", c, (char)c);
-                       } else {
-                               printf("key: %d\n", c);
-                       }
                }
-               if((nticks % 250) == 0) {
-                       con_printf(71, 0, "[%ld]", nticks);
+               if(i >= nmodes) {
+                       printf("failed to find a suitable video mode\n");
+                       return -1;
                }
        }
+       free(vmodes);
+
+       return 0;
+}
+
+
+
+static int modecmp(const void *a, const void *b)
+{
+       const struct video_mode *ma = a;
+       const struct video_mode *mb = b;
+       unsigned long aval = ma->width | (ma->height << 16);
+       unsigned long bval = mb->width | (mb->height << 16);
+
+       if(aval != bval) {
+               return bval - aval;
+       }
+       return mb->bpp - ma->bpp;
 }

diff --git a/src/test/ausamples.s b/src/test/ausamples.s
deleted file mode 100644 (file)
index f20b5a9..0000000
--- a/src/test/ausamples.s
+++ /dev/null
@@ -1,6 +0,0 @@
-       .data
-       .global snd_click
-       .global snd_click_size
-snd_click:
-       .incbin "click-s8_mono.pcm"
-snd_click_size: .long . - snd_click

diff --git a/src/test/vbetest.c b/src/test/vbetest.c
deleted file mode 100644 (file)
index 7dd2bad..0000000
--- a/src/test/vbetest.c
+++ /dev/null
@@ -1,188 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "video.h"
-#include "asmops.h"
-#include "keyb.h"
-#include "psaux.h"
-#include "contty.h"
-#include "audio.h"
-
-static void draw_cursor(int x, int y, uint16_t col);
-static int click_sound_callback(void *buffer, int size, void *cls);
-
-static uint16_t *framebuf;
-
-#define CURSOR_XSZ     12
-#define CURSOR_YSZ     16
-static uint16_t cursor[] = {
-       0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-       0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-       0xffff, 0x0001, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-       0xffff, 0x0001, 0x0001, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-       0xffff, 0x0001, 0x0001, 0x0001, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-       0xffff, 0x0001, 0x0001, 0x0001, 0x0001, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-       0xffff, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-       0xffff, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000,
-       0xffff, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0xffff, 0x0000, 0x0000, 0x0000,
-       0xffff, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0xffff, 0xffff, 0xffff, 0xffff, 0x0000, 0x0000,
-       0xffff, 0x0001, 0x0001, 0x0001, 0x0001, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-       0xffff, 0x0001, 0x0001, 0xffff, 0x0001, 0x0001, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-       0xffff, 0x0001, 0xffff, 0xffff, 0x0001, 0x0001, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-       0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0x0001, 0x0001, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000,
-       0xffff, 0x0000, 0x0000, 0x0000, 0xffff, 0x0001, 0x0001, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000,
-       0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
-};
-
-static int click;
-
-/* defined in sndsamples.s */
-extern signed char snd_click[];
-extern int snd_click_size;
-
-int vbetest(void)
-{
-       int i, j, nmodes, mx, my, idx;
-       unsigned int st, prev_st = 0;
-       struct video_mode vi;
-       uint16_t *fbptr;
-
-       nmodes = video_mode_count();
-       printf("%d video modes found:\n", nmodes);
-       for(i=0; i<nmodes; i++) {
-               if(video_mode_info(i, &vi) == -1) {
-                       continue;
-               }
-               printf(" %04x: %dx%d %d bpp", vi.mode, vi.width, vi.height, vi.bpp);
-               if(vi.bpp > 8) {
-                       printf(" (%d%d%d)\n", vi.rbits, vi.gbits, vi.bbits);
-               } else {
-                       putchar('\n');
-               }
-       }
-
-       if((idx = find_video_mode_idx(640, 480, 16)) == -1) {
-               return -1;
-       }
-       video_mode_info(idx, &vi);
-
-       if(!(framebuf = set_video_mode(vi.mode))) {
-               return -1;
-       }
-       get_color_bits(&vi.rbits, &vi.gbits, &vi.bbits);
-       get_color_shift(&vi.rshift, &vi.gshift, &vi.bshift);
-       get_color_mask(&vi.rmask, &vi.gmask, &vi.bmask);
-
-       fbptr = framebuf;
-       for(i=0; i<480; i++) {
-               for(j=0; j<640; j++) {
-                       int xor = i^j;
-                       uint16_t r = xor & 0xff;
-                       uint16_t g = (xor << 1) & 0xff;
-                       uint16_t b = (xor << 2) & 0xff;
-
-                       r >>= 8 - vi.rbits;
-                       g >>= 8 - vi.gbits;
-                       b >>= 8 - vi.bbits;
-
-                       *fbptr++ = ((r << vi.rshift) & vi.rmask) | ((g << vi.gshift) & vi.gmask) |
-                               ((b << vi.bshift) & vi.bmask);
-               }
-       }
-
-       set_mouse_bounds(0, 0, 639, 479);
-
-       audio_set_callback(click_sound_callback, 0);
-
-       /* empty the kb queue */
-       while(kb_getkey() != -1);
-
-       for(;;) {
-               if(kb_getkey() != -1) {
-                       break;
-               }
-
-               st = mouse_state(&mx, &my);
-
-               for(i=0; i<3; i++) {
-                       unsigned int bit = 1 << i;
-                       if(((st & bit) ^ (prev_st & bit)) & (st & bit)) {
-                               click = 1;
-                       }
-               }
-               if(click) {
-                       audio_play(22050, 1);
-               }
-
-               prev_st = st;
-
-               draw_cursor(mx, my, st & 1 ? 0xf800 : (st & 2 ? 0x7e0 : (st & 4 ? 0x00ff : 0)));
-
-               halt_cpu();
-       }
-
-       set_vga_mode(3);
-       con_clear();
-       return 0;
-}
-
-static void draw_cursor(int x, int y, uint16_t col)
-{
-       static uint16_t saved[CURSOR_XSZ * CURSOR_YSZ];
-       static int saved_x = -1, saved_y, saved_w, saved_h;
-
-       int i, j, w, h;
-       uint16_t *dest, *src, *savp;
-
-       if(saved_x >= 0) {
-               dest = framebuf + saved_y * 640 + saved_x;
-               src = saved;
-
-               for(i=0; i<saved_h; i++) {
-                       for(j=0; j<saved_w; j++) {
-                               *dest++ = *src++;
-                       }
-                       src += CURSOR_XSZ - saved_w;
-                       dest += 640 - saved_w;
-               }
-       }
-
-       dest = framebuf + y * 640 + x;
-       src = cursor;
-       savp = saved;
-
-       w = 640 - x;
-       if(w > CURSOR_XSZ) w = CURSOR_XSZ;
-       h = 480 - y;
-       if(h > CURSOR_YSZ) h = CURSOR_YSZ;
-
-       saved_x = x;
-       saved_y = y;
-       saved_w = w;
-       saved_h = h;
-
-       for(i=0; i<h; i++) {
-               for(j=0; j<w; j++) {
-                       uint16_t c = *src++;
-                       *savp++ = *dest;
-                       if(c) {
-                               if(c == 1) c = col;
-                               *dest = c;
-                       }
-                       dest++;
-               }
-               src += CURSOR_XSZ - w;
-               dest += 640 - w;
-               savp += CURSOR_XSZ - w;
-       }
-}
-
-/* snd_click_size is < 65536 so we can just throw it all at once in there */
-static int click_sound_callback(void *buffer, int size, void *cls)
-{
-       if(click) {
-               memcpy(buffer, snd_click, snd_click_size);
-               click = 0;
-               return snd_click_size;
-       }
-       return 0;
-}

diff --git a/src/test/vbetest.h b/src/test/vbetest.h
deleted file mode 100644 (file)
index fa2899a..0000000
--- a/src/test/vbetest.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef VBETEST_H_
-#define VBETEST_H_
-
-int vbetest(void);
-
-#endif /* VBETEST_H_ */