WebSVN – SvarDOS – Diff – //install/trunk/install.c

 };
 #pragma pack (pop)
 /* get the DOS drive data table list */
-static struct dos_udsc far *get_dos_udsc(void)  {
+static struct dos_udsc far *get_dos_udsc(void);
-  unsigned short udsc_seg = 0, udsc_off = 0;
+#pragma aux get_dos_udsc = \
-  _asm {
+"push ds" \
-    push ds
+"mov ax, 0x0803" \
+"int 0x2f" /* drive data table list is in DS:DI, error if DI is 0xffff */ \
-    push di
+"push ds" \
-    mov ax, 0x0803
+"pop es" \
-    int 0x2f
+"pop ds" \
-    /* drive data table list is in DS:DI now */
-    mov udsc_seg, ds
+"cmp di, 0xffff" \
-    mov udsc_off, di
+"jne DONE" \
-    pop di
+"xor di, di" \
-    pop ds
+"mov es, di" \
-  }
+"DONE:" \
-  if (udsc_off == 0xffff) return(NULL);
+modify [ax] \
-  return(MK_FP(udsc_seg, udsc_off));
+value [es di]
-}
 /* returns 0 if fsid is a valid (recognized) filesystem for SvarDOS install  */
 static int is_fstype_valid(unsigned char fsid) {
   switch (fsid) {
       drives[listlen].hd = drv & 3;
       drives[listlen].partid = i;
       drives[listlen].start_lba = ((unsigned long *)entry)[2];
       drives[listlen].tot_sect = ((unsigned long *)entry)[3];
-      /* now iterate over DOS drives and try to match ont to this MBR entry */
+      /* now iterate over DOS drives and try to match one to this MBR entry */
       udsc_node = udsc_root;
       while (udsc_node != NULL) {
         if (udsc_node->hd != drv) goto NEXT;
         if (udsc_node->start_lba != drives[listlen].start_lba) goto NEXT;
   mdr_dos_getkey();
   reboot();
+}
+static void reinit_ega(void);
+#pragma aux reinit_ega = \
+"mov ah, 0x0f" /* get current video mode */ \
+"int 0x10"     /* al contains the current video mode now */ \
+"or al, 128"   /* set AL's high bit so BIOS does not flush VRAM (EGA+) */ \
+"xor ah, ah"   /* re-set video mode (to whatever is set in AL) */ \
+"int 0x10" \
+modify [ax bx]
 static void loadcp(const struct slocales *locales) {
   char buff[64];
   if (locales->codepage == 437) return;
   mdr_cout_locate(1, 0);
   if (locales->egafile == 1) {
   snprintf(buff, sizeof(buff), "MODE CON CP SEL=%u > NUL", locales->codepage);
   exec(buff);
   /* below I re-init the video controller - apparently this is required if
    * I want the new glyph symbols to be actually applied, at least some
    * (broken?) BIOSes, like VBox, apply glyphs only at next video mode change */
-  _asm {
-    push bx
-    mov ah, 0x0F  /* get current video mode */
-    int 0x10      /* al contains the current video mode now */
-    or al, 128    /* set high bit of AL to instruct BIOS not to flush VRAM's content (EGA+) */
-    xor ah, ah    /* re-set video mode (to whatever is set in AL) */
-    int 0x10
+  reinit_ega();
-    pop bx
-  }
+}
 int main(void) {
   struct slocales locales;

Subversion Repositories SvarDOS

(root)//install/trunk/install.c – Rev 2157 → 2158