fixes/cleanup

[polintos/scott/priv.git] / kernel / io / console / misc.cc

diff --git a/kernel/io/console/misc.cc b/kernel/io/console/misc.cc
index b66e4ae57634f94be1bc3c24a81e241c3b1c0148..7da03244e01d4bfbafd0f560fdf15fbde6e45315 100644 (file)
--- a/kernel/io/console/misc.cc
+++ b/kernel/io/console/misc.cc
@@ -2,23 +2,15 @@
 //
 // This software is copyright (c) 2006 Scott Wood <scott@buserror.net>.
 // 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the "Software"), to deal with
-// the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-// of the Software, and to permit persons to whom the Software is furnished to do
-// so, subject to the following condition:
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors or contributors be held liable for any damages
+// arising from the use of this software.
 // 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-// CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
-// SOFTWARE.
+// Permission is hereby granted to everyone, free of charge, to use, copy,
+// modify, prepare derivative works of, publish, distribute, perform,
+// sublicense, and/or sell copies of the Software, provided that the above
+// copyright notice and disclaimer of warranty be included in all copies or
+// substantial portions of this software.
 
 #include <kern/console.h>
 #include <kern/libc.h>
@@ -26,7 +18,7 @@
 
 namespace IO {
 namespace Console {
-       void Console::write(char *data, size_t len)
+       void Console::write(const char *data, size_t len)
        {
                u64 len64 = len;
                write(Array<octet>((octet *)data, len), &len64);
@@ -49,8 +41,6 @@ Lock::SpinLock printf_lock;
 // happens.  If you really need that, you'll need to call snprintf
 // and primary_console->write yourself.
 
-void vga_write(uint8_t *buf, u64 len);
-
 size_t printf(const char *str, ...)
 {
        Lock::AutoSpinLockRecIRQ autolock(printf_lock);