xnu-344.49.tar.gz

[apple/xnu.git] / osfmk / ppc / PseudoKernel.c

diff --git a/osfmk/ppc/PseudoKernel.c b/osfmk/ppc/PseudoKernel.c
index 4498361879bd363f06452dc35fcf5bac9ec8acde..9fc5bb276256e41d23e505222a1aff9cc105844a 100644 (file)
--- a/osfmk/ppc/PseudoKernel.c
+++ b/osfmk/ppc/PseudoKernel.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -59,7 +62,6 @@ kern_return_t syscall_notify_interrupt ( void ) {
   
     UInt32                     interruptState; 
     task_t                     task;
   
     UInt32                     interruptState; 
     task_t                     task;

-    spl_t                      s;

        thread_act_t    act, fact;
        thread_t                thread;
        bbRupt                  *bbr;
        thread_act_t    act, fact;
        thread_t                thread;
        bbRupt                  *bbr;


@@ -121,9 +123,7 @@ kern_return_t syscall_notify_interrupt ( void ) {
        bbr->rh.next = act->handlers;                                   /* Put our interrupt at the start of the list */
        act->handlers = &bbr->rh;
 
        bbr->rh.next = act->handlers;                                   /* Put our interrupt at the start of the list */
        act->handlers = &bbr->rh;
 

-       s = splsched();                                                                 /* No talking in class */

        act_set_apc(act);                                                               /* Set an APC AST */
        act_set_apc(act);                                                               /* Set an APC AST */

-       splx(s);                                                                                /* Ok, you can talk now */

 
        act_unlock_thread(act);                                                 /* Unlock the activation */
        return KERN_SUCCESS;                                                    /* We're done... */
 
        act_unlock_thread(act);                                                 /* Unlock the activation */
        return KERN_SUCCESS;                                                    /* We're done... */


@@ -151,7 +151,7 @@ void bbSetRupt(ReturnHandler *rh, thread_act_t act) {
 
        (void)hw_atomic_sub(&act->mact.emPendRupts, 1); /* Uncount this 'rupt */
 
 
        (void)hw_atomic_sub(&act->mact.emPendRupts, 1); /* Uncount this 'rupt */
 

-       if(!(sv = (savearea *)find_user_regs(act))) {   /* Find the user state registers */
+       if(!(sv = find_user_regs(act))) {                               /* Find the user state registers */

                kfree((vm_offset_t)bbr, sizeof(bbRupt));        /* Couldn't find 'em, release the control block */
                return;
        }
                kfree((vm_offset_t)bbr, sizeof(bbRupt));        /* Couldn't find 'em, release the control block */
                return;
        }


@@ -256,7 +256,7 @@ kern_return_t enable_bluebox(
        
        (void) pmap_enter(kernel_pmap,                                                  /* Map this into the kernel */
                kerndescaddr, physdescaddr, VM_PROT_READ|VM_PROT_WRITE, 
        
        (void) pmap_enter(kernel_pmap,                                                  /* Map this into the kernel */
                kerndescaddr, physdescaddr, VM_PROT_READ|VM_PROT_WRITE, 

-               TRUE);
+               VM_WIMG_USE_DEFAULT, TRUE);

        
        th->top_act->mact.bbDescAddr = (unsigned int)kerndescaddr+origdescoffset;       /* Set kernel address of the table */
        th->top_act->mact.bbUserDA = (unsigned int)Desc_TableStart;     /* Set user address of the table */
        
        th->top_act->mact.bbDescAddr = (unsigned int)kerndescaddr+origdescoffset;       /* Set kernel address of the table */
        th->top_act->mact.bbUserDA = (unsigned int)Desc_TableStart;     /* Set user address of the table */