- movitz-cvs@common-lisp.net - mailman3.common-lisp.net

[movitz-cvs] CVS update: movitz/losp/lib/net/ip4.lisp
by Frode Vatvedt Fjeld 24 Nov '04

24 Nov '04

Update of /project/movitz/cvsroot/movitz/losp/lib/net In directory common-lisp.net:/tmp/cvs-serv26339 Modified Files: ip4.lisp Log Message: Include :lib/net/tftp. Date: Wed Nov 24 17:21:58 2004 Author: ffjeld Index: movitz/losp/lib/net/ip4.lisp diff -u movitz/losp/lib/net/ip4.lisp:1.11 movitz/losp/lib/net/ip4.lisp:1.12 --- movitz/losp/lib/net/ip4.lisp:1.11 Wed Nov 24 15:22:57 2004 +++ movitz/losp/lib/net/ip4.lisp Wed Nov 24 17:21:57 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Wed Apr 30 13:52:57 2003 ;;;; -;;;; $Id: ip4.lisp,v 1.11 2004/11/24 14:22:57 ffjeld Exp $ +;;;; $Id: ip4.lisp,v 1.12 2004/11/24 16:21:57 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -43,6 +43,7 @@ :type ,type)) (require :lib/net/arp) +(require :lib/net/tftp) (defclass ip4-stack () ((interface

1 0

[movitz-cvs] CVS update: movitz/losp/lib/net/ip6.lisp
by Frode Vatvedt Fjeld 24 Nov '04

24 Nov '04

Update of /project/movitz/cvsroot/movitz/losp/lib/net In directory common-lisp.net:/tmp/cvs-serv26313 Modified Files: ip6.lisp Log Message: *** empty log message *** Date: Wed Nov 24 17:21:42 2004 Author: ffjeld Index: movitz/losp/lib/net/ip6.lisp diff -u movitz/losp/lib/net/ip6.lisp:1.6 movitz/losp/lib/net/ip6.lisp:1.7 --- movitz/losp/lib/net/ip6.lisp:1.6 Sun Apr 11 20:53:42 2004 +++ movitz/losp/lib/net/ip6.lisp Wed Nov 24 17:21:42 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Wed Nov 14 17:25:31 2001 ;;;; -;;;; $Id: ip6.lisp,v 1.6 2004/04/11 18:53:42 ffjeld Exp $ +;;;; $Id: ip6.lisp,v 1.7 2004/11/24 16:21:42 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -568,9 +568,12 @@ (defvar *ne2000* nil) -(defun ip6-test (&optional (ne2000 (or *ne2000* - (setf *ne2000* (some #'muerte.x86-pc.ne2k:ne2k-probe muerte.x86-pc.ne2k:+ne2k-probe-addresses+)) - (error "No ethernet device.")))) +(defun ip6-test (&optional (ne2000 + (or *ne2000* + (setf *ne2000* + (some #'muerte.x86-pc.ne2k:ne2k-probe + muerte.x86-pc.ne2k:*ne2k-probe-addresses*)) + (error "No ethernet device.")))) (let* ((link-local-address (link-local-address-by-mac (mac-address ne2000))) (solicited-node-address (solicited-node-address link-local-address)) (neighbor-cache (make-neighbor-cache)))

1 0

[movitz-cvs] CVS update: movitz/losp/x86-pc/ne2k.lisp
by Frode Vatvedt Fjeld 24 Nov '04

24 Nov '04

Update of /project/movitz/cvsroot/movitz/losp/x86-pc In directory common-lisp.net:/tmp/cvs-serv26251 Modified Files: ne2k.lisp Log Message: *** empty log message *** Date: Wed Nov 24 17:20:30 2004 Author: ffjeld Index: movitz/losp/x86-pc/ne2k.lisp diff -u movitz/losp/x86-pc/ne2k.lisp:1.12 movitz/losp/x86-pc/ne2k.lisp:1.13 --- movitz/losp/x86-pc/ne2k.lisp:1.12 Wed Nov 24 14:12:02 2004 +++ movitz/losp/x86-pc/ne2k.lisp Wed Nov 24 17:20:30 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Sep 17 15:16:00 2002 ;;;; -;;;; $Id: ne2k.lisp,v 1.12 2004/11/24 13:12:02 ffjeld Exp $ +;;;; $Id: ne2k.lisp,v 1.13 2004/11/24 16:20:30 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -47,7 +47,7 @@ (let ((io-space (make-io-space :range io-base #x20))) (with-io-space-lock () (when (null (io-space-occupants io-space)) - (format t "Probing for ne2k NIC at #x~X.." io-base) + (format *query-io* "~&Probing for ne2k NIC at #x~X.." io-base) (with-dp8390 (dp8390 io-base) (let ((tmp (dp8390 #x1f))) (io-delay 5000)

1 0

[movitz-cvs] CVS update: movitz/losp/x86-pc/keyboard.lisp
by Frode Vatvedt Fjeld 24 Nov '04

24 Nov '04

Update of /project/movitz/cvsroot/movitz/losp/x86-pc In directory common-lisp.net:/tmp/cvs-serv26225 Modified Files: keyboard.lisp Log Message: Make poll-key similar to poll-char. A key is a character or a symbolic key name. Date: Wed Nov 24 17:20:15 2004 Author: ffjeld Index: movitz/losp/x86-pc/keyboard.lisp diff -u movitz/losp/x86-pc/keyboard.lisp:1.3 movitz/losp/x86-pc/keyboard.lisp:1.4 --- movitz/losp/x86-pc/keyboard.lisp:1.3 Thu Oct 7 14:45:07 2004 +++ movitz/losp/x86-pc/keyboard.lisp Wed Nov 24 17:20:14 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Mon Sep 24 16:04:12 2001 ;;;; -;;;; $Id: keyboard.lisp,v 1.3 2004/10/07 12:45:07 ffjeld Exp $ +;;;; $Id: keyboard.lisp,v 1.4 2004/11/24 16:20:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -23,6 +23,7 @@ ;; read-char poll-keypress read-keypress + poll-key set-leds cpu-reset)) @@ -155,7 +156,7 @@ (aref *scan-codes* key-code)))) ;;; (< -1 key-code (length *scan-codes*))) -(defun read-key () +(defun get-key () (when (lowlevel-event-p) (multiple-value-bind (key-code release-p) (lowlevel-read) @@ -175,7 +176,7 @@ (defun poll-keypress () (multiple-value-bind (key release-p) - (read-key) + (get-key) (unless release-p (values key *qualifier-state*)))) @@ -189,6 +190,7 @@ (multiple-value-bind (key qualifiers) (poll-keypress) (cond + ((not key) nil) ((symbolp key) (case key (:up #\^p) @@ -204,8 +206,16 @@ (- (char-code #\a))))) (t key)))) -;;;(defun read-char () -;;; (loop when (poll-char) return it)) +(defun poll-key () + (multiple-value-bind (key qualifiers) + (poll-keypress) + (if (and (characterp key) + (qualifier-p :ctrl qualifiers) + (char<= #\a (char-downcase key) #\z)) + (code-char (+ (char-code #\^a) + (char-code (char-downcase key)) + (- (char-code #\a)))) + key))) (defun set-leds (led0 led1 led2) (loop while (logbitp 1 (io-port #x64 :unsigned-byte8)))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/streams.lisp
by Frode Vatvedt Fjeld 24 Nov '04

24 Nov '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv26183 Modified Files: streams.lisp Log Message: Added read-key, which is like read-char only it can return symbols such as :up, :page-down etc. also, not just characters. Date: Wed Nov 24 17:19:36 2004 Author: ffjeld Index: movitz/losp/muerte/streams.lisp diff -u movitz/losp/muerte/streams.lisp:1.3 movitz/losp/muerte/streams.lisp:1.4 --- movitz/losp/muerte/streams.lisp:1.3 Thu May 20 20:13:55 2004 +++ movitz/losp/muerte/streams.lisp Wed Nov 24 17:19:36 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Mon Jun 30 14:33:15 2003 ;;;; -;;;; $Id: streams.lisp,v 1.3 2004/05/20 18:13:55 ffjeld Exp $ +;;;; $Id: streams.lisp,v 1.4 2004/11/24 16:19:36 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -115,6 +115,10 @@ (defun read-char (&optional input-stream (eof-error-p t) eof-value recursive-p) " => char" (%read-char (input-stream-designator input-stream) eof-error-p eof-value recursive-p t)) + +(defun read-key (&optional input-stream (eof-error-p t) eof-value recursive-p) + " => char, symbol, etc." + (%read-key (input-stream-designator input-stream) eof-error-p eof-value recursive-p t)) (defun finish-output (&optional stream) "finish-output attempts to ensure that any buffered output sent to output-stream has reached its

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/simple-streams.lisp
by Frode Vatvedt Fjeld 24 Nov '04

24 Nov '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv26156 Modified Files: simple-streams.lisp Log Message: Added %read-key. Date: Wed Nov 24 17:19:02 2004 Author: ffjeld Index: movitz/losp/muerte/simple-streams.lisp diff -u movitz/losp/muerte/simple-streams.lisp:1.6 movitz/losp/muerte/simple-streams.lisp:1.7 --- movitz/losp/muerte/simple-streams.lisp:1.6 Sat Sep 25 17:26:49 2004 +++ movitz/losp/muerte/simple-streams.lisp Wed Nov 24 17:19:02 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Fri Aug 29 13:39:43 2003 ;;;; -;;;; $Id: simple-streams.lisp,v 1.6 2004/09/25 15:26:49 ffjeld Exp $ +;;;; $Id: simple-streams.lisp,v 1.7 2004/11/24 16:19:02 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -512,6 +512,13 @@ (%finish-output stream)) (funcall-stm-handler j-read-char (sm melded-stream stream) eof-error-p eof-value blocking-p))))) + +(defun %read-key (stream eof-error-p eof-value recursive-p blocking-p) + (etypecase stream + (function + (funcall stream 'stream-read-key)) + (simple-stream ; XXX + (%read-char stream eof-error-p eof-value recursive-p blocking-p)))) (defun %unread-char (stream character) (declare (type simple-stream stream) (ignore character))

1 0

[movitz-cvs] CVS update: movitz/losp/lib/net/tftp.lisp
by Frode Vatvedt Fjeld 24 Nov '04

24 Nov '04

Update of /project/movitz/cvsroot/movitz/losp/lib/net In directory common-lisp.net:/tmp/cvs-serv19612 Added Files: tftp.lisp Log Message: Some simple TFTP code that writes a file to a tftp server. Date: Wed Nov 24 15:27:15 2004 Author: ffjeld

1 0

[movitz-cvs] CVS update: movitz/losp/lib/net/ip4.lisp
by Frode Vatvedt Fjeld 24 Nov '04

24 Nov '04

Update of /project/movitz/cvsroot/movitz/losp/lib/net In directory common-lisp.net:/tmp/cvs-serv19491 Modified Files: ip4.lisp Log Message: Have checksum-ok accept any number of checksum terms, since typically there will be a frew terms from the pseudo-header and one term from the actual packet. Date: Wed Nov 24 15:22:57 2004 Author: ffjeld Index: movitz/losp/lib/net/ip4.lisp diff -u movitz/losp/lib/net/ip4.lisp:1.10 movitz/losp/lib/net/ip4.lisp:1.11 --- movitz/losp/lib/net/ip4.lisp:1.10 Wed Nov 24 14:12:26 2004 +++ movitz/losp/lib/net/ip4.lisp Wed Nov 24 15:22:57 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Wed Apr 30 13:52:57 2003 ;;;; -;;;; $Id: ip4.lisp,v 1.10 2004/11/24 13:12:26 ffjeld Exp $ +;;;; $Id: ip4.lisp,v 1.11 2004/11/24 14:22:57 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -112,10 +112,12 @@ (setf (ip4-ref packet start 10 :unsigned-byte16) checksum))) packet) -(defun checksum-ok (x) - (= #xffff - (+ (ldb (byte 16 0) x) - (ash x -16)))) +(defun checksum-ok (x &rest more-xes) + (declare (dynamic-extent more-xes)) + (let ((x (reduce #'add-u16-ones-complement more-xes :initial-value x))) + (= #xffff + (+ (ldb (byte 16 0) x) + (ash x -16))))) (defun ip-input (stack packet start) (let ((header-size (* 4 (ip-header-length packet start))))

1 0

[movitz-cvs] CVS update: movitz/losp/lib/package.lisp
by Frode Vatvedt Fjeld 24 Nov '04

24 Nov '04

Update of /project/movitz/cvsroot/movitz/losp/lib In directory common-lisp.net:/tmp/cvs-serv19455/losp/lib Modified Files: package.lisp Log Message: Added extract-zero-terminated-string. Date: Wed Nov 24 15:20:56 2004 Author: ffjeld Index: movitz/losp/lib/package.lisp diff -u movitz/losp/lib/package.lisp:1.5 movitz/losp/lib/package.lisp:1.6 --- movitz/losp/lib/package.lisp:1.5 Wed Nov 24 11:08:59 2004 +++ movitz/losp/lib/package.lisp Wed Nov 24 15:20:55 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Fri Sep 27 17:24:11 2002 ;;;; -;;;; $Id: package.lisp,v 1.5 2004/11/24 10:08:59 ffjeld Exp $ +;;;; $Id: package.lisp,v 1.6 2004/11/24 14:20:55 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -47,6 +47,7 @@ ;; :lib/misc #:checksum-octets #:add-u16-ones-complement + #:extract-zero-terminated-string #:make-counter-u32 #:u32-add

1 0

[movitz-cvs] CVS update: movitz/losp/lib/misc.lisp
by Frode Vatvedt Fjeld 24 Nov '04

24 Nov '04

Update of /project/movitz/cvsroot/movitz/losp/lib In directory common-lisp.net:/tmp/cvs-serv19438 Modified Files: misc.lisp Log Message: Added extract-zero-terminated-string. Date: Wed Nov 24 15:20:49 2004 Author: ffjeld Index: movitz/losp/lib/misc.lisp diff -u movitz/losp/lib/misc.lisp:1.6 movitz/losp/lib/misc.lisp:1.7 --- movitz/losp/lib/misc.lisp:1.6 Wed Nov 24 11:05:47 2004 +++ movitz/losp/lib/misc.lisp Wed Nov 24 15:20:49 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Mon May 12 17:13:31 2003 ;;;; -;;;; $Id: misc.lisp,v 1.6 2004/11/24 10:05:47 ffjeld Exp $ +;;;; $Id: misc.lisp,v 1.7 2004/11/24 14:20:49 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -88,6 +88,18 @@ (declare (dynamic-extent integers)) (reduce #'add-u16-ones-complement integers :initial-value 0)))) +(defun extract-zero-terminated-string (vector &optional start (end (length vector))) + (check-type vector (and vector (not simple-vector))) + (let ((string (make-string (- (or (position 0 vector :start start) end) + start)))) + (loop for i from 0 below (length string) + do (setf (char string i) + (memref vector (+ (movitz-type-slot-offset 'movitz-basic-vector 'data) + start) + :index i + :type :character)) + finally (return string)))) + (defstruct (counter-u32 (:constructor make-counter-u32-object)) lo hi)

1 0