From 3c4e084de9ed00171748c20de1251d347fc33c1c Mon Sep 17 00:00:00 2001 From: Jacob Potter Date: Tue, 16 Dec 2008 14:44:24 -0500 Subject: [PATCH] add a lot of copyright headers --- include/raw/stdarg.h | 74 +++++++-------------------------------- include/raw/stdint.h | 10 ++++++ include/reg-82801b.h | 10 ++++++ include/reg-82815.h | 10 ++++++ include/serial.h | 10 ++++++ include/smi.h | 10 ++++++ include/string.h | 10 ++++++ include/text.h | 10 ++++++ include/timer.h | 10 ++++++ include/vga-overlay.h | 10 ++++++ lib/console.c | 10 +++--- lib/minilib.c | 11 ++++++ lib/serial.c | 10 ++++++ net/etherboot-compat.h | 11 ++++++ net/net.c | 10 ++++++ net/net.h | 10 ++++++ net/rfb.c | 10 ++++++ net/rfb.h | 10 ++++++ netwatch/drivers.c | 10 ++++++ netwatch/entry.asm | 8 +++++ netwatch/firstrun.c | 10 ++++++ netwatch/keyboard.c | 10 ++++++ netwatch/main.c | 10 ++++++ netwatch/packet.c | 10 ++++++ netwatch/packet.h | 10 ++++++ netwatch/pagingstub-asm.s | 7 ++++ netwatch/pagingstub.c | 11 ++++++ netwatch/smi.c | 10 ++++++ netwatch/traps.c | 10 ++++++ netwatch/traps.h | 10 ++++++ netwatch/vga-overlay.c | 10 ++++++ netwatch/vm_flags.h | 9 +++-- 32 files changed, 312 insertions(+), 69 deletions(-) diff --git a/include/raw/stdarg.h b/include/raw/stdarg.h index 0de5da4..ba9add0 100644 --- a/include/raw/stdarg.h +++ b/include/raw/stdarg.h @@ -1,68 +1,18 @@ -/* - * stdarg.h - * Modified for use in 15-410 at CMU - * Zachary Anderson(zra) - */ - -/* - * Copyright (c) 1994 The University of Utah and the Flux Group. - * All rights reserved. - * - * This file is part of the Flux OSKit. The OSKit is free software, also known - * as "open source;" you can redistribute it and/or modify it under the terms - * of the GNU General Public License (GPL), version 2, as published by the Free - * Software Foundation (FSF). To explore alternate licensing terms, contact - * the University of Utah at csl-dist@cs.utah.edu or +1-801-585-3271. - * - * The OSKit is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GPL for more details. You should have - * received a copy of the GPL along with the OSKit; see the file COPYING. If - * not, write to the FSF, 59 Temple Place #330, Boston, MA 02111-1307, USA. - */ - -/* - * Mach Operating System - * Copyright (c) 1993 Carnegie Mellon University. - * All Rights Reserved. - * - * Permission to use, copy, modify and distribute this software and its - * documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR - * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie Mellon - * the rights to redistribute these changes. - */ - - #ifndef _STDARG_H_ #define _STDARG_H_ -#define __va_size(type) ((sizeof(type)+3) & ~0x3) +/* This is awful, but really these are compiler intrinsics, so we use the + * GNU compiler intrinsics. + */ -#ifndef _VA_LIST_ -#define _VA_LIST_ -typedef char * va_list; +#ifdef __GNUC__ +typedef __builtin_va_list va_list; +#define va_start(v,l) __builtin_va_start(v,l) +#define va_end(v) __builtin_va_end(v) +#define va_arg(v,l) __builtin_va_arg(v,l) +#define va_copy(d,s) __builtin_va_copy(d,s) +#else +#error "Don't know how to use varargs not on GNUC, sorry." #endif -#define va_start(pvar, lastarg) \ - ((pvar) = (char*)(void*)&(lastarg) + __va_size(lastarg)) -#define va_end(pvar) -#define va_arg(pvar,type) \ - ((pvar) += __va_size(type), \ - *((type *)((pvar) - __va_size(type)))) - -#endif /* _STDARG_H_ */ +#endif diff --git a/include/raw/stdint.h b/include/raw/stdint.h index dbe4222..eada8ab 100644 --- a/include/raw/stdint.h +++ b/include/raw/stdint.h @@ -1,3 +1,13 @@ +/* stdint.h + * Standard integer types + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #ifndef _STDINT_H #define _STDINT_H diff --git a/include/reg-82801b.h b/include/reg-82801b.h index 4e116c2..3192228 100644 --- a/include/reg-82801b.h +++ b/include/reg-82801b.h @@ -1,3 +1,13 @@ +/* reg-82801b.h + * Register macros for Intel 82801B + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #ifndef _REG_82801B_H #define _REG_82801B_H diff --git a/include/reg-82815.h b/include/reg-82815.h index 3f792e0..60138e4 100644 --- a/include/reg-82815.h +++ b/include/reg-82815.h @@ -1,3 +1,13 @@ +/* output.h + * Register macros for Intel 82815 + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #ifndef _REG_82815_H #define _REG_82815_H diff --git a/include/serial.h b/include/serial.h index dcb5921..01934ca 100644 --- a/include/serial.h +++ b/include/serial.h @@ -1,3 +1,13 @@ +/* serial.h + * Prototypes for serial output routines + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #ifndef SERIAL_H #define SERIAL_H diff --git a/include/smi.h b/include/smi.h index 69fd7ef..a5dad92 100644 --- a/include/smi.h +++ b/include/smi.h @@ -1,3 +1,13 @@ +/* smi.h + * Prototypes for generic SMI handling routines + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #ifndef SMI_H #define SMI_H diff --git a/include/string.h b/include/string.h index cbc9fe0..a25ab8f 100644 --- a/include/string.h +++ b/include/string.h @@ -1 +1,11 @@ +/* string.h + * Stub string.h + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #include diff --git a/include/text.h b/include/text.h index 474e123..7e1ab5c 100644 --- a/include/text.h +++ b/include/text.h @@ -1,3 +1,13 @@ +/* text.h + * Prototypes for text rendering routines + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #ifndef _TEXT_H #include diff --git a/include/timer.h b/include/timer.h index b3b6985..c75674c 100644 --- a/include/timer.h +++ b/include/timer.h @@ -1,3 +1,13 @@ +/* output.h + * Prototypes for timer handling routines + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #ifndef TIMER_H #define TIMER_H diff --git a/include/vga-overlay.h b/include/vga-overlay.h index d493f67..9ae273f 100644 --- a/include/vga-overlay.h +++ b/include/vga-overlay.h @@ -1,3 +1,13 @@ +/* vga-overlay.h + * Prototype for VGA text overlay routines + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #ifndef VGA_OVERLAY_H #define VGA_OVERLAY_H diff --git a/lib/console.c b/lib/console.c index 66cfbaf..db95d7d 100644 --- a/lib/console.c +++ b/lib/console.c @@ -1,8 +1,10 @@ -/** @file console.c - * @brief A console driver. +/* console.c + * A console driver. + * + * Copyright (c) 2008 Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. * - * @author Joshua Wise (jwise) - * @bug None known */ #include diff --git a/lib/minilib.c b/lib/minilib.c index 30412db..392eae7 100644 --- a/lib/minilib.c +++ b/lib/minilib.c @@ -1,7 +1,18 @@ +/* minilib.c + * General-purpose C library routines. + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #include "console.h" #include #include + /* We have both _memcpy and memcpy, because gcc might be able to do better in lwip. * For small things, gcc inlines its memcpy, but for large things, we call out * to this memcpy. diff --git a/lib/serial.c b/lib/serial.c index 6043db2..95d8300 100644 --- a/lib/serial.c +++ b/lib/serial.c @@ -1,3 +1,13 @@ +/* serial.c + * Serial output routines. + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #include #include diff --git a/net/etherboot-compat.h b/net/etherboot-compat.h index b3ccc51..d56dce5 100644 --- a/net/etherboot-compat.h +++ b/net/etherboot-compat.h @@ -1,3 +1,14 @@ +/* etherboot-compat.h + * EtherBoot driver compatibility routines + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + + #ifndef _ETHERBOOT_COMPAT_H #define _ETHERBOOT_COMPAT_H diff --git a/net/net.c b/net/net.c index 25926af..1462f09 100644 --- a/net/net.c +++ b/net/net.c @@ -1,3 +1,13 @@ +/* net.c + * Top-level network glue code + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #include #include #include diff --git a/net/net.h b/net/net.h index ae82f47..02c544e 100644 --- a/net/net.h +++ b/net/net.h @@ -1,3 +1,13 @@ +/* net.h + * Top-level network clue code headers + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #ifndef _NET_H #define _NET_H diff --git a/net/rfb.c b/net/rfb.c index 8e5ab91..514dfc7 100644 --- a/net/rfb.c +++ b/net/rfb.c @@ -1,3 +1,13 @@ +/* rfb.c + * Remote framebuffer server + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #include #include #include diff --git a/net/rfb.h b/net/rfb.h index 601e2f5..25fa3fb 100644 --- a/net/rfb.h +++ b/net/rfb.h @@ -1,3 +1,13 @@ +/* rfb.h + * Remote framebuffer server + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #ifndef _RFB_H #define _RFB_H diff --git a/netwatch/drivers.c b/netwatch/drivers.c index fca0bfe..9517b1a 100644 --- a/netwatch/drivers.c +++ b/netwatch/drivers.c @@ -1,3 +1,13 @@ +/* drivers.c + * PCI driver table + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #include extern struct pci_driver a3c90x_driver; diff --git a/netwatch/entry.asm b/netwatch/entry.asm index 151382e..e5d073b 100644 --- a/netwatch/entry.asm +++ b/netwatch/entry.asm @@ -1,3 +1,11 @@ +; entry.asm +; SMI entry point +; NetWatch system management mode administration console +; +; Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. +; This program is free software; you can redistribute and/or modify it under +; the terms found in the file LICENSE in the root of this source tree. + org 0xA8000 [bits 16] entry: diff --git a/netwatch/firstrun.c b/netwatch/firstrun.c index efa0600..66b08d4 100644 --- a/netwatch/firstrun.c +++ b/netwatch/firstrun.c @@ -1,3 +1,13 @@ +/* firstrun.c + * First-run handler + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #include #include #include diff --git a/netwatch/keyboard.c b/netwatch/keyboard.c index a53a6e7..64be445 100644 --- a/netwatch/keyboard.c +++ b/netwatch/keyboard.c @@ -1,3 +1,13 @@ +/* keyboard.c + * Keyboard scan code conversion and injection. + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #include "keyboard.h" #include #include diff --git a/netwatch/main.c b/netwatch/main.c index db49f60..3bfc599 100644 --- a/netwatch/main.c +++ b/netwatch/main.c @@ -1,3 +1,13 @@ +/* main.c + * Main post-paging entry point. + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #include #include #include diff --git a/netwatch/packet.c b/netwatch/packet.c index ff5c41e..99294f2 100644 --- a/netwatch/packet.c +++ b/netwatch/packet.c @@ -1,3 +1,13 @@ +/* packet.c + * OS-to-NetWatch communication packet interface + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #include #include "packet.h" diff --git a/netwatch/packet.h b/netwatch/packet.h index 1544f04..211804f 100644 --- a/netwatch/packet.h +++ b/netwatch/packet.h @@ -1,3 +1,13 @@ +/* packet.h + * OS-to-NetWatch communication packet interface + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #ifndef _PAGETABLE_H #define _PAGETABLE_H diff --git a/netwatch/pagingstub-asm.s b/netwatch/pagingstub-asm.s index 414e463..964d06e 100644 --- a/netwatch/pagingstub-asm.s +++ b/netwatch/pagingstub-asm.s @@ -1,3 +1,10 @@ +# pagingstub-asm.s +# Paging-enable helper routines +# NetWatch system management mode administration console +# +# Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. +# This program is free software; you can redistribute and/or modify it under +# the terms found in the file LICENSE in the root of this source tree. .globl set_cr0 diff --git a/netwatch/pagingstub.c b/netwatch/pagingstub.c index 941be86..5ba1857 100644 --- a/netwatch/pagingstub.c +++ b/netwatch/pagingstub.c @@ -1,3 +1,14 @@ +/* pagingstub.c + * Paging enable routines + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + + #include #include #include diff --git a/netwatch/smi.c b/netwatch/smi.c index d519341..e551ac4 100644 --- a/netwatch/smi.c +++ b/netwatch/smi.c @@ -1,3 +1,13 @@ +/* smi.c + * First-run SMI C entry point + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #include #include #include diff --git a/netwatch/traps.c b/netwatch/traps.c index bbf3327..bf5ca80 100644 --- a/netwatch/traps.c +++ b/netwatch/traps.c @@ -1,3 +1,13 @@ +/* traps.c + * Trap handling routines + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #include #include #include diff --git a/netwatch/traps.h b/netwatch/traps.h index f57e036..430dcd8 100644 --- a/netwatch/traps.h +++ b/netwatch/traps.h @@ -1,3 +1,13 @@ +/* traps.h + * Trap handling macros + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #ifndef TRAPS_H #define TRAPS_H diff --git a/netwatch/vga-overlay.c b/netwatch/vga-overlay.c index 6c6020c..77dc053 100644 --- a/netwatch/vga-overlay.c +++ b/netwatch/vga-overlay.c @@ -1,3 +1,13 @@ +/* vga-overlay.c + * VGA text overlay code + * NetWatch system management mode administration console + * + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. + * + */ + #include #include #include diff --git a/netwatch/vm_flags.h b/netwatch/vm_flags.h index f003516..e8a0f3f 100644 --- a/netwatch/vm_flags.h +++ b/netwatch/vm_flags.h @@ -1,8 +1,11 @@ -/** Page table and page directory flags. +/* vm_flags.h + * Page table and page directory flags. + * NetWatch system management mode administration console * - * From intel-sys.pdf. + * Copyright (c) 2008 Jacob Potter and Joshua Wise. All rights reserved. + * This program is free software; you can redistribute and/or modify it under + * the terms found in the file LICENSE in the root of this source tree. * - * @author Jacob Potter (jdpotter) */ #ifndef _VM_FLAGS_H -- 2.39.2