xnu-3248.60.10.tar.gz

[apple/xnu.git] / osfmk / console / i386 / video_scroll.c

diff --git a/osfmk/console/i386/video_scroll.c b/osfmk/console/i386/video_scroll.c
index f54bba22248e6e894706c6de8e447ebb6f8c402d..4c84776c7d1bf50ff75ff24ec8a05e908c103f2a 100644 (file)
--- a/osfmk/console/i386/video_scroll.c
+++ b/osfmk/console/i386/video_scroll.c
@@ -1,35 +1,46 @@
 /*
  * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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.
+ * 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. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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,
- * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
 
-void video_scroll_up(unsigned long start,
-                     unsigned long end,
-                     unsigned long dest)
+#include <types.h>
+#include <console/video_console.h>
+
+extern void bcopy(const void *, void *, size_t);
+
+void video_scroll_up(void *start,
+                     void *end,
+                     void *dest)
 {
-    bcopy(start, dest, (end - start) << 2);
+    bcopy(start, dest, ((char*)end - (char*)start) << 2);;
 }
 
-void video_scroll_down(unsigned long start,  /* HIGH addr */
-                       unsigned long end,    /* LOW addr */
-                       unsigned long dest)   /* HIGH addr */
+void video_scroll_down(void *start,  /* HIGH addr */
+                       void *end,    /* LOW addr */
+                       void *dest)   /* HIGH addr */
 {
-    bcopy(end, dest, (start - end) << 2);
+    bcopy(end, dest, ((char*)start - (char*)end) << 2);
 }