Index: sys/arch/evbppc/kurobox/disksubr.c =================================================================== RCS file: /home10/src_cvs/src/sys/arch/evbppc/kurobox/disksubr.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sys/arch/evbppc/kurobox/disksubr.c 8 Sep 2007 10:37:05 -0000 1.1 +++ sys/arch/evbppc/kurobox/disksubr.c 8 Sep 2007 12:41:12 -0000 1.2 @@ -171,7 +171,7 @@ goto done; for (dlp = (struct disklabel *)bp->b_data; - dlp <= (struct disklabel *)(bp->b_data + lp->d_secsize - + dlp <= (struct disklabel *)((__caddr_t)bp->b_data + lp->d_secsize - sizeof (*dlp)); dlp = (struct disklabel *)((char *)dlp + sizeof(long))) { if (dlp->d_magic == DISKMAGIC @@ -241,7 +241,7 @@ if (biowait(bp)) goto done; - mbrmagicp = (u_int16_t *)(bp->b_data + MBR_MAGIC_OFFSET); + mbrmagicp = (u_int16_t *)((__caddr_t)bp->b_data + MBR_MAGIC_OFFSET); if ((*mbrmagicp != MBR_MAGIC) && (*mbrmagicp != MBR_MAGIC_EB)) goto done; #ifdef MBR_EI @@ -255,7 +255,7 @@ #endif /* Extract info from MBR partition table */ - mp = (struct mbr_partition *)(bp->b_data + MBR_PART_OFFSET); + mp = (struct mbr_partition *)((__caddr_t)bp->b_data + MBR_PART_OFFSET); for (i = 0; i < MBR_PART_COUNT; i++, mp++) { if (mp->mbrp_size == 0) { continue; @@ -503,6 +503,7 @@ * within the boundaris of the partition. Adjust transfer * if needed, and signal errors or early completion. */ +#if 0 int bounds_check_with_label(dk, bp, wlabel) struct disk *dk; @@ -541,3 +542,4 @@ bp->b_flags |= B_ERROR; return -1; } +#endif Index: sys/arch/evbppc/kurobox/extintr.c =================================================================== RCS file: /home10/src_cvs/src/sys/arch/evbppc/kurobox/extintr.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sys/arch/evbppc/kurobox/extintr.c 8 Sep 2007 10:37:05 -0000 1.1 +++ sys/arch/evbppc/kurobox/extintr.c 8 Sep 2007 12:41:12 -0000 1.2 @@ -420,25 +420,25 @@ if ((ipending & ~pcpl) & SINT_CLOCK) { ipending &= ~SINT_CLOCK; - KERNEL_LOCK(LK_CANRECURSE|LK_EXCLUSIVE); + KERNEL_LOCK(LK_CANRECURSE|LK_EXCLUSIVE, 0); softintr__run(IPL_SOFTCLOCK); - KERNEL_UNLOCK(); + KERNEL_UNLOCK(0,0,0); intrcnt[CNT_SINT_CLOCK]++; } if ((ipending & ~pcpl) & SINT_NET) { void softnet(int); ipending &= ~SINT_NET; - KERNEL_LOCK(LK_CANRECURSE|LK_EXCLUSIVE); + KERNEL_LOCK(LK_CANRECURSE|LK_EXCLUSIVE,0); softintr__run(IPL_SOFTNET); - KERNEL_UNLOCK(); + KERNEL_UNLOCK(0,0,0); intrcnt[CNT_SINT_NET]++; } if ((ipending & ~pcpl) & SINT_SERIAL) { ipending &= ~SINT_SERIAL; #if NCOM > 0 - KERNEL_LOCK(LK_CANRECURSE|LK_EXCLUSIVE); + KERNEL_LOCK(LK_CANRECURSE|LK_EXCLUSIVE,0); softintr__run(IPL_SOFTSERIAL); - KERNEL_UNLOCK(); + KERNEL_UNLOCK(0,0,0); #endif intrcnt[CNT_SINT_SERIAL]++; } Index: sys/arch/evbppc/kurobox/kurobox_intr.h =================================================================== RCS file: /home10/src_cvs/src/sys/arch/evbppc/kurobox/kurobox_intr.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sys/arch/evbppc/kurobox/kurobox_intr.h 8 Sep 2007 10:37:06 -0000 1.1 +++ sys/arch/evbppc/kurobox/kurobox_intr.h 8 Sep 2007 12:41:12 -0000 1.2 @@ -82,6 +82,8 @@ #define IPL_AUDIO 2 /* audio */ #define IPL_CLOCK 1 /* clock */ #define IPL_HIGH 1 /* everything */ +/* added */ +#define IPL_SCHED 1 /* everything */ #define IPL_SERIAL 0 /* serial */ #define NIPL 10 @@ -94,6 +96,18 @@ #ifndef _LOCORE #define CLKF_BASEPRI(frame) ((frame)->pri == 0) +/* added */ +typedef int ipl_t; +typedef struct { + ipl_t _ipl; +} ipl_cookie_t; +static inline ipl_cookie_t +makeiplcookie(ipl_t ipl) +{ + + return (ipl_cookie_t){._ipl = ipl}; +} + /* * Interrupt handler chains. intr_establish() inserts a handler into * the list. The handler is called with its (single) argument. @@ -116,6 +130,15 @@ static __inline void splx(int); static __inline void set_sint(int); +/* added */ +extern int imask[]; +static inline int +splraiseipl(ipl_cookie_t icookie) +{ + + return splraise(imask[icookie._ipl]); +} + extern volatile int cpl, ipending, astpending, tickspending; extern int imask[]; extern long intrcnt[]; Index: sys/arch/evbppc/kurobox/machdep.c =================================================================== RCS file: /home10/src_cvs/src/sys/arch/evbppc/kurobox/machdep.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sys/arch/evbppc/kurobox/machdep.c 8 Sep 2007 10:37:06 -0000 1.1 +++ sys/arch/evbppc/kurobox/machdep.c 8 Sep 2007 12:41:12 -0000 1.2 @@ -56,7 +56,7 @@ #include #include #include -#include +/* #include */ #include #include #include Index: sys/arch/evbppc/kurobox/dev/eumb.c =================================================================== RCS file: /home10/src_cvs/src/sys/arch/evbppc/kurobox/dev/eumb.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sys/arch/evbppc/kurobox/dev/eumb.c 28 Sep 2007 18:00:15 -0000 1.1 +++ sys/arch/evbppc/kurobox/dev/eumb.c 28 Sep 2007 18:10:41 -0000 1.2 @@ -92,7 +92,7 @@ if (strcmp(eaa->eumb_name, cf->cf_name) != 0) return 0; - return 1; + return 2; } static int Index: sys/arch/powerpc/include/openpic.h =================================================================== RCS file: /home10/src_cvs/src/sys/arch/powerpc/include/openpic.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- sys/arch/powerpc/include/openpic.h 19 Aug 2007 09:57:16 -0000 1.1.1.1 +++ sys/arch/powerpc/include/openpic.h 8 Sep 2007 12:41:25 -0000 1.2 @@ -30,6 +30,11 @@ #include +/* added */ +void openpic_enable_irq __P((int, int)); +void openpic_disable_irq __P((int)); +void openpic_set_priority __P((int, int)); + extern volatile unsigned char *openpic_base; static __inline u_int openpic_read __P((int)); Index: sys/dev/pci/files.pci =================================================================== RCS file: /home10/src_cvs/src/sys/dev/pci/files.pci,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- sys/dev/pci/files.pci 19 Aug 2007 09:57:53 -0000 1.1.1.1 +++ sys/dev/pci/files.pci 8 Sep 2007 12:41:31 -0000 1.2 @@ -891,5 +891,5 @@ include "dev/pci/drm/files.pcidrm" # generic framebuffer console driver, PCI frontend -attach genfb at pci with genfb_pci -file dev/pci/genfb_pci.c genfb_pci +#attach genfb at pci with genfb_pci +#file dev/pci/genfb_pci.c genfb_pci Index: sys/dev/pci/if_re_pci.c =================================================================== RCS file: /home10/src_cvs/src/sys/dev/pci/if_re_pci.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sys/dev/pci/if_re_pci.c 8 Sep 2007 10:37:20 -0000 1.2 +++ sys/dev/pci/if_re_pci.c 8 Sep 2007 12:41:31 -0000 1.3 @@ -217,7 +217,7 @@ pci_conf_write(pc, pa->pa_tag, PCI_INTERRUPT_REG, irq); } } -#endif +/* #endif */ /* * Map control/status registers. */