Subject: Another fix for the kernel.
To: None <port-vax@NetBSD.org>
From: Johnny Billquist <johnny.billquist@softjar.se>
List: port-vax
Date: 12/04/2005 04:54:41
One more thing. The kernel now expects there to be an splraiseipl 
function, which hasn't existed before.
This also makes the kernel compile for VAX fail.
Here is a patch for that one. Maybe someone can commit it?

===================================================================
RCS file: /cvsroot/src/sys/arch/vax/include/intr.h,v
retrieving revision 1.17
diff -c -r1.17 intr.h
*** intr.h      27 Nov 2005 14:01:45 -0000      1.17
--- intr.h      4 Dec 2005 03:49:04 -0000
***************
*** 93,99 ****
                                 : "g" (reg));                   \
   }))

! #define _splraise(reg)                                                \
   ({                                                            \
         register int __val;                                     \
         __asm __volatile ("mfpr $0x12,%0"                       \
--- 93,99 ----
                                 : "g" (reg));                   \
   }))

! #define splraiseipl(reg)                                      \
   ({                                                            \
         register int __val;                                     \
         __asm __volatile ("mfpr $0x12,%0"                       \
***************
*** 115,127 ****

   #define spl0()                _splset(IPL_NONE)               /* IPL00 */
   #define spllowersoftclock() _splset(IPL_SOFTCLOCK)    /* IPL08 */
! #define splddb()      _splraise(IPL_SOFTDDB)          /* IPL0F */
! #define splconsmedia()        _splraise(IPL_CONSMEDIA)        /* IPL14 */

   #include <sys/spl.h>

   /* These are better to use when playing with VAX buses */
! #define       spluba()        _splraise(IPL_UBA)              /* IPL17 */
   #define spl4()                splx(0x14)
   #define spl5()                splx(0x15)
   #define spl6()                splx(0x16)
--- 115,127 ----

   #define spl0()                _splset(IPL_NONE)               /* IPL00 */
   #define spllowersoftclock() _splset(IPL_SOFTCLOCK)    /* IPL08 */
! #define splddb()      splraiseipl(IPL_SOFTDDB)        /* IPL0F */
! #define splconsmedia()        splraiseipl(IPL_CONSMEDIA)      /* IPL14 */

   #include <sys/spl.h>

   /* These are better to use when playing with VAX buses */
! #define       spluba()        splraiseipl(IPL_UBA)            /* IPL17 */
   #define spl4()                splx(0x14)
   #define spl5()                splx(0x15)
   #define spl6()                splx(0x16)
--------------------------

-- 
Johnny Billquist                  || "I'm on a bus
                                   ||  on a psychedelic trip
email: bqt@update.uu.se           ||  Reading murder books
pdp is alive!                     ||  tryin' to stay hip" - B. Idol


-- 
No virus found in this outgoing message.
Checked by AVG Free Edition.
Version: 7.1.362 / Virus Database: 267.13.10/188 - Release Date: 2005-11-29