Merge branch 'master' of github.com:Minep/lunaix-os

[lunaix-os.git] / lunaix-os / arch / i386 / exceptions / i386_isrm.c

diff --git a/lunaix-os/arch/i386/exceptions/i386_isrm.c b/lunaix-os/arch/i386/exceptions/i386_isrm.c
index 2aabc39214711f8443c340301cc72ece00c0e53d..f1facf91a5a46fe1e3118411c32340c80343d662 100644 (file)
--- a/lunaix-os/arch/i386/exceptions/i386_isrm.c
+++ b/lunaix-os/arch/i386/exceptions/i386_isrm.c
@@ -90,7 +90,7 @@ isrm_bindirq(int irq, isr_cb irq_handler)
 {
     int iv;
     if (!(iv = isrm_ivexalloc(irq_handler))) {
 {
     int iv;
     if (!(iv = isrm_ivexalloc(irq_handler))) {

-        panickf("out of IV resource. (irq=%d)", irq);
+        fail("out of IV resource.");

         return 0; // never reach
     }
 
         return 0; // never reach
     }
 


@@ -121,8 +121,9 @@ isrm_get(int iv)
 }
 
 ptr_t
 }
 
 ptr_t

-isrm_get_payload(int iv)
+isrm_get_payload(const isr_param* param)

 {
 {

+    int iv = param->execp->vector;

     assert(iv < 256);
 
     return ivhand_payload[iv];
     assert(iv < 256);
 
     return ivhand_payload[iv];