Changeset 141 for trunk

Timestamp:

Oct 2, 2012, 9:56:32 AM (13 years ago)

Author:

Markus Thielen

Message:

fixed #13 (kernel exit call for trap dumps)

Location:

trunk/src/os2ahci

Files:

• init.asm (modified) (3 diffs)
• os2ahci.c (modified) (3 diffs)
• os2ahci.h (modified) (1 diff)
• version.h (modified) (1 diff)

trunk/src/os2ahci/init.asm

@@ -14 +14 @@
                 PUBLIC  _asm_strat           ; low-level strategy routine
                 PUBLIC  _asm_idc_entry       ; low-level IDC entry point 
+                PUBLIC  _asm_krnl_exit       ; low-level kernel exit routine
                 PUBLIC  _readl               ; MMIO read (32 bits)
                 PUBLIC  _writel              ; MMIO write (32 bits)
@@ -91 +92 @@
                 EXTRN   _reset_ctxhook : NEAR     ; C reset context hook
                 EXTRN   _engine_ctxhook : NEAR    ; C engine context hook
+                EXTRN   _apm_suspend : NEAR       ; C routine for INT13 IO enable
 _TEXT           ENDS
 
@@ -152 +154 @@
                 RET
 _asm_idc_entry  ENDP
+
+;  Kernel exit routine to enable INT13 I/O (called before a trap dump occurrs)
+_asm_krnl_exit  PROC    FAR
+
+                PUSH    ES
+                PUSH    DS
+                MOV     AX,DGROUP
+                MOV     DS,AX
+                CLD
+
+                ;  call C routine
+                CALL    _apm_suspend
+
+                POP     DS
+                POP     ES
+
+                RET
+_asm_krnl_exit  ENDP        
+        
 
                 .386

trunk/src/os2ahci/os2ahci.c

@@ -59 +59 @@
   }
 
+/* constants for undefined kernel exit routine;
+ * see register_krnl_exit() func */
+#define DevHlp_RegisterKrnlExit   0x006f
+
+#define FLAG_KRNL_EXIT_ADD        0x1000
+#define FLAG_KRNL_EXIT_REMOVE     0x2000
+
+#define TYPE_KRNL_EXIT_NMI        0x0000  /* non masked interrupts */
+#define TYPE_KRNL_EXIT_SFF        0x0001  /* system fatal faults */
+#define TYPE_KRNL_EXIT_PROCDUMP   0x0002
+#define TYPE_KRNL_EXIT_DYN        0x0003
+#define TYPE_KRNL_EXIT_INT13      0x0004  /* enable int13 IO */
+
 /* ------------------------ typedefs and structures ------------------------ */
 
 /* -------------------------- function prototypes -------------------------- */
 
-void _cdecl  small_code_      (void);
-
-static int   add_unit_info    (IORB_CONFIGURATION _far *iorb_conf, int dt_ai,
-                               int a, int p, int d, int scsi_id);
+void _cdecl  small_code_        (void);
+
+static int   add_unit_info      (IORB_CONFIGURATION _far *iorb_conf, int dt_ai,
+                                 int a, int p, int d, int scsi_id);
+
+static void  register_krnl_exit (void);
 
 /* ------------------------ global/static variables ------------------------ */
@@ -381 +396 @@
     rsp->CodeEnd = (u16) end_of_code;
     rsp->DataEnd = (u16) &end_of_data;
+
+    /* register kernel exit routine for trap dumps */
+    register_krnl_exit();
+
     return(STDON);
 
@@ -1494 +1513 @@
 }
 
+/*******************************************************************************
+ * Register kernel exit handler for trap dumps. Our exit handler will be called
+ * right before the kernel starts a dump; that's where we reset the controller
+ * so it supports BIOS int13 I/O calls.
+ */
+static void register_krnl_exit(void)
+{
+  _asm {
+
+    push ds
+    push es
+    push bx
+    push si
+    push di
+
+    mov ax, FLAG_KRNL_EXIT_ADD
+    mov cx, TYPE_KRNL_EXIT_INT13
+    mov bx, SEG asm_krnl_exit
+    mov si, OFFSET asm_krnl_exit
+    mov dl, DevHlp_RegisterKrnlExit
+    call Device_Help
+
+    pop  di
+    pop  si
+    pop  bx
+    pop  es
+    pop  ds
+  }
+
+  dprintf("Registered kernel exit routine for INT13 mode\n");
+}

trunk/src/os2ahci/os2ahci.h

@@ -392 +392 @@
 extern void _cdecl _far reset_hook    (void);
 extern void _cdecl _far engine_hook   (void);
+extern void _cdecl _far asm_krnl_exit (void);
 
 /* os2ahci.c */

trunk/src/os2ahci/version.h

@@ -14 +14 @@
 
 
-#define VERSION            124       /* driver version (2 implied decimals) */
+#define VERSION            125       /* driver version (2 implied decimals) */