Update of /project/movitz/cvsroot/movitz/losp/x86-pc In directory common-lisp.net:/tmp/cvs-serv31835

Modified Files: all.lisp cmos.lisp dp8390.lisp interrupt.lisp memory.lisp ne2k.lisp package.lisp pic8259.lisp pit8253.lisp textmode-console.lisp textmode.lisp vga.lisp Log Message: Cleaned up package muerte.x86-pc. Date: Thu Jan 15 12:13:53 2004 Author: ffjeld

Index: movitz/losp/x86-pc/all.lisp diff -u movitz/losp/x86-pc/all.lisp:1.1.1.1 movitz/losp/x86-pc/all.lisp:1.2 --- movitz/losp/x86-pc/all.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/all.lisp Thu Jan 15 12:13:53 2004 @@ -1,6 +1,6 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 2001-2003, +;;;; Copyright (C) 2001-2004, ;;;; Department of Computer Science, University of Tromsø, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. @@ -10,13 +10,11 @@ ;;;; Author: Frode Vatvedt Fjeld frodef@acm.org ;;;; Created at: Thu Sep 27 21:14:56 2001 ;;;; -;;;; $Id: all.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: all.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------

-(defpackage muerte.x86-pc) -(in-package muerte.x86-pc) - +(require :x86-pc/package) (require :x86-pc/memory) (require :x86-pc/keyboard) (require :x86-pc/vga)

Index: movitz/losp/x86-pc/cmos.lisp diff -u movitz/losp/x86-pc/cmos.lisp:1.1.1.1 movitz/losp/x86-pc/cmos.lisp:1.2 --- movitz/losp/x86-pc/cmos.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/cmos.lisp Thu Jan 15 12:13:53 2004 @@ -10,18 +10,14 @@ ;;;; Author: Frode Vatvedt Fjeld frodef@acm.org ;;;; Created at: Mon Sep 30 12:23:02 2002 ;;;; -;;;; $Id: cmos.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: cmos.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------

+(require :x86-pc/package) (require :lib/named-integers) (require :lib/bcd) (provide :x86-pc/cmos) - -(defpackage muerte.x86-pc - (:use muerte.lib) - (:export rtc-register - cmos-register))

(in-package muerte.x86-pc)

Index: movitz/losp/x86-pc/dp8390.lisp diff -u movitz/losp/x86-pc/dp8390.lisp:1.1.1.1 movitz/losp/x86-pc/dp8390.lisp:1.2 --- movitz/losp/x86-pc/dp8390.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/dp8390.lisp Thu Jan 15 12:13:53 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld frodef@acm.org ;;;; Created at: Wed Sep 18 12:21:36 2002 ;;;; -;;;; $Id: dp8390.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: dp8390.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------

@@ -18,19 +18,6 @@ (require :x86-pc/io-space) (require :lib/net/ethernet) (provide :x86-pc/dp8390) - -(defpackage muerte.x86-pc.ne2k - (:use muerte.cl muerte muerte.lib muerte.x86-pc muerte.ethernet) - (:export #:with-dp8390 - #:with-dp8390-dma - #:dp8390-initialize - #:dp8390-device - #:ring-start - #:ring-stop - #:io-base - #:ring-overflow-count - #:transmit-buffer - ))

(in-package muerte.x86-pc.ne2k)

Index: movitz/losp/x86-pc/interrupt.lisp diff -u movitz/losp/x86-pc/interrupt.lisp:1.1.1.1 movitz/losp/x86-pc/interrupt.lisp:1.2 --- movitz/losp/x86-pc/interrupt.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/interrupt.lisp Thu Jan 15 12:13:53 2004 @@ -10,19 +10,12 @@ ;;;; Author: Frode Vatvedt Fjeld frodef@acm.org ;;;; Created at: Fri May 4 18:08:50 2001 ;;;; -;;;; $Id: interrupt.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: interrupt.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------

(require :x86-pc/pic8259) (provide :x86-pc/interrupt) - -(defpackage muerte.x86-pc - (:export idt-init - interrupt-handler - int-frame-ref - software-interrupt - *last-interrupt-frame*))

(in-package muerte.x86-pc)

Index: movitz/losp/x86-pc/memory.lisp diff -u movitz/losp/x86-pc/memory.lisp:1.1.1.1 movitz/losp/x86-pc/memory.lisp:1.2 --- movitz/losp/x86-pc/memory.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/memory.lisp Thu Jan 15 12:13:53 2004 @@ -10,15 +10,12 @@ ;;;; Author: Frode Vatvedt Fjeld frodef@acm.org ;;;; Created at: Thu Oct 11 16:32:11 2001 ;;;; -;;;; $Id: memory.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: memory.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------

(require :x86-pc/package) (provide :x86-pc/memory) - -(defpackage muerte.x86-pc - (:export memory-size))

(in-package muerte.x86-pc)

Index: movitz/losp/x86-pc/ne2k.lisp diff -u movitz/losp/x86-pc/ne2k.lisp:1.1.1.1 movitz/losp/x86-pc/ne2k.lisp:1.2 --- movitz/losp/x86-pc/ne2k.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/ne2k.lisp Thu Jan 15 12:13:53 2004 @@ -10,20 +10,33 @@ ;;;; Author: Frode Vatvedt Fjeld frodef@acm.org ;;;; Created at: Tue Sep 17 15:16:00 2002 ;;;; -;;;; $Id: ne2k.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: ne2k.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------

(require :x86-pc/package) + +(defpackage muerte.x86-pc.ne2k + (:use muerte.cl muerte muerte.lib muerte.x86-pc muerte.ethernet) + (:export #:ne2k-probe + #:+ne2k-probe-addresses+ + + #:with-dp8390 + #:with-dp8390-dma + #:dp8390-initialize + #:dp8390-device + #:ring-start + #:ring-stop + #:io-base + #:ring-overflow-count + #:transmit-buffer + )) + (require :lib/net/ethernet) (require :x86-pc/dp8390)

(provide :x86-pc/ne2k)

-(defpackage muerte.x86-pc.ne2k - (:use muerte.cl muerte muerte.lib muerte.x86-pc muerte.ethernet) - (:export #:ne2k-probe - #:+ne2k-probe-addresses+))

(in-package muerte.x86-pc.ne2k)

Index: movitz/losp/x86-pc/package.lisp diff -u movitz/losp/x86-pc/package.lisp:1.1.1.1 movitz/losp/x86-pc/package.lisp:1.2 --- movitz/losp/x86-pc/package.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/package.lisp Thu Jan 15 12:13:53 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld frodef@acm.org ;;;; Created at: Tue Oct 2 20:30:28 2001 ;;;; -;;;; $Id: package.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: package.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------

@@ -28,4 +28,32 @@ #:with-io-space-lock #:make-io-space #:reset-device + #:memory-size + + #:vga-cursor-location + #:vga-crt-controller-register + #:vga-graphics-register + #:vga-memory-map + + #:rtc-register + #:cmos-register + + #:idt-init + #:interrupt-handler + #:int-frame-ref + #:software-interrupt + #:*last-interrupt-frame* + + #:pit8253-timer-mode + #:pit8253-timer-count + + #:+pit8253-frequency+ + #:+pit8253-nanosecond-period+ + + #:textmode-console + #:vga-text-console + + #:pic8259-irq-mask + #:pic8259-end-of-interrupt + #:init-pic8259 ))

Index: movitz/losp/x86-pc/pic8259.lisp diff -u movitz/losp/x86-pc/pic8259.lisp:1.1.1.1 movitz/losp/x86-pc/pic8259.lisp:1.2 --- movitz/losp/x86-pc/pic8259.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/pic8259.lisp Thu Jan 15 12:13:53 2004 @@ -10,16 +10,11 @@ ;;;; Author: Frode Vatvedt Fjeld frodef@acm.org ;;;; Created at: Tue May 22 15:23:01 2001 ;;;; -;;;; $Id: pic8259.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: pic8259.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------

(provide :x86-pc/pic8259) - -(defpackage muerte.x86-pc - (:export pic8259-irq-mask - pic8259-end-of-interrupt - init-pic8259))

(in-package muerte.x86-pc)

Index: movitz/losp/x86-pc/pit8253.lisp diff -u movitz/losp/x86-pc/pit8253.lisp:1.1.1.1 movitz/losp/x86-pc/pit8253.lisp:1.2 --- movitz/losp/x86-pc/pit8253.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/pit8253.lisp Thu Jan 15 12:13:53 2004 @@ -10,20 +10,13 @@ ;;;; Author: Frode Vatvedt Fjeld frodef@acm.org ;;;; Created at: Tue Jan 15 11:30:55 2002 ;;;; -;;;; $Id: pit8253.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: pit8253.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------

+(require :x86-pc/package) (require :lib/named-integers) (provide :x86-pc/pit8253) - -(defpackage muerte.x86-pc - (:use muerte.cl muerte.lib) - (:export pit8253-timer-mode - pit8253-timer-count - - +pit8253-frequency+ - +pit8253-nanosecond-period+))

(in-package muerte.x86-pc)

Index: movitz/losp/x86-pc/textmode-console.lisp diff -u movitz/losp/x86-pc/textmode-console.lisp:1.1.1.1 movitz/losp/x86-pc/textmode-console.lisp:1.2 --- movitz/losp/x86-pc/textmode-console.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/textmode-console.lisp Thu Jan 15 12:13:53 2004 @@ -1,6 +1,6 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 2001, 2003, +;;;; Copyright (C) 2001, 2003-2004, ;;;; Department of Computer Science, University of Tromsø, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld frodef@acm.org ;;;; Created at: Tue Jul 8 15:13:24 2003 ;;;; -;;;; $Id: textmode-console.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: textmode-console.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------

@@ -18,12 +18,7 @@ (require :x86-pc/textmode) (provide :x86-pc/textmode-console)

-(defpackage muerte.x86-pc - (:export vga-text-console - )) - (in-package muerte.x86-pc) -

(defclass vga-text-console (console stream) ((base

Index: movitz/losp/x86-pc/textmode.lisp diff -u movitz/losp/x86-pc/textmode.lisp:1.1.1.1 movitz/losp/x86-pc/textmode.lisp:1.2 --- movitz/losp/x86-pc/textmode.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/textmode.lisp Thu Jan 15 12:13:53 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Thu Nov 9 15:38:56 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: textmode.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: textmode.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------

@@ -19,11 +19,7 @@ (require :x86-pc/package) (require :x86-pc/keyboard) (require :lib/package) - (provide :x86-pc/textmode) - -(defpackage muerte.x86-pc - (:export textmode-console))

(in-package muerte.x86-pc)

Index: movitz/losp/x86-pc/vga.lisp diff -u movitz/losp/x86-pc/vga.lisp:1.1.1.1 movitz/losp/x86-pc/vga.lisp:1.2 --- movitz/losp/x86-pc/vga.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/vga.lisp Thu Jan 15 12:13:53 2004 @@ -10,18 +10,12 @@ ;;;; Author: Frode Vatvedt Fjeld frodef@acm.org ;;;; Created at: Tue Sep 25 14:08:20 2001 ;;;; -;;;; $Id: vga.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: vga.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------

(require :x86-pc/package) (provide :x86-pc/vga) - -(defpackage muerte.x86-pc - (:export vga-cursor-location - vga-crt-controller-register - vga-graphics-register - vga-memory-map))

(in-package muerte.x86-pc)