From 5ca08942414cc6b75816f67dce648780a380b351 Mon Sep 17 00:00:00 2001 From: Vincent Ollivier Date: Fri, 15 Mar 2024 19:08:10 +0100 Subject: [PATCH] Update documentation (#592) * Add ntp to manual * Refactor ntp script * Update website * Update install output * Move ntp to the bottom of the manual * Update light palette screenshot * Update manual install output * Update changelog * Refactor net code * Update website * Update binaries * Refactor long lines * Update changelog * Refactor device try_from * Update doc --- CHANGELOG.md | 6 +++ doc/images/light.png | Bin 3738 -> 3630 bytes doc/lisp.md | 82 +++++++++++++++-------------- doc/manual.md | 50 +++++++++++++----- doc/network.md | 2 +- doc/shell.md | 3 +- dsk/bin/exec | Bin 22896 -> 22864 bytes dsk/bin/halt | Bin 1184 -> 1200 bytes dsk/bin/hello | Bin 19464 -> 19416 bytes dsk/bin/ntp | 4 +- src/sys/fs/device.rs | 62 ++++++++-------------- src/sys/net/mod.rs | 14 ++--- src/usr/shell.rs | 10 +++- www/editor.html | 6 +-- www/filesystem.html | 4 +- www/lisp.html | 122 ++++++++++++++++++++++--------------------- www/manual.html | 51 +++++++++++++----- www/network.html | 2 +- www/shell.html | 3 +- 19 files changed, 230 insertions(+), 191 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5626cf2..1e0bc50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Changelog ## Unreleased +- Improve setup process (#596) +- Improve warning when MFS is not mounted (#595) +- Bump pic8259 from 0.10.4 to 0.11.0 (#594) +- Bump object from 0.33.0 to 0.34.0 (#593) +- Add drive device (#555) +- Add memory dump command (#574) - Fix shell autocomplete (#591) - Update x86_64 crate from 0.14.12 to 0.15.0 (#590) - Bump object from 0.32.2 to 0.33.0 (#589) diff --git a/doc/images/light.png b/doc/images/light.png index f3b7cebb75cb1c1c3a619f347e9cf45dfe389f2d..eeab1ff49496e76da9c5dfb53fd2ed15922c0e7a 100644 GIT binary patch delta 3401 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 lisp -MOROS Lisp v0.5.0 +MOROS Lisp v0.7.0 > (+ 1 2 3) 6 @@ -170,44 +170,9 @@ Would produce the following output: ## Changelog -### 0.1.0 (2021-07-21) -MOROS Lisp started from [Risp](https://github.com/stopachka/risp) and was -extended to include the seven primitive operators and the two special forms of -John McCarthy's paper "Recursive Functions of Symbolic Expressions and Their -Computation by Machine" (1960) and "The Roots of Lisp" (2002) by Paul Graham. - -### 0.2.0 (2021-12-04) -The whole implementation was refactored and the parser was rewritten to use -[Nom](https://github.com/Geal/nom). This allowed the addition of strings to the -language and reading from the filesystem. - -### 0.3.0 (2022-12-12) -- Rewrite the evaluation code -- Add new functions -- Add a core library - -### 0.3.1 (2022-06-06) -- Rewrite parts of the code -- Add new functions and examples - -### 0.3.2 (2022-07-02) -- Add new functions - -### 0.4.0 (2022-08-25) -- Rewrite a lot of the code -- Add integer and big integer support -- Add tail call optimization (TCO) -- Add macro support - -### 0.5.0 (2023-06-21) -- Rename or add aliases to many functions -- Add full support for line and inline comments -- Add params to function representations -- Add docstring to functions - -### 0.6.0 (2023-09-23) -- Add file, number, string, and regex namespaces -- Add socket functions + ### 0.7.0 (2023-12-22) - Add binary and hexadecimal number literals @@ -218,4 +183,41 @@ language and reading from the filesystem. - Use `/` instead of `.` as namespace separator - Add `number->string` (aliased to `num->str`) with an optional radix argument -### Unreleased +### 0.6.0 (2023-09-23) +- Add file, number, string, and regex namespaces +- Add socket functions + +### 0.5.0 (2023-06-21) +- Rename or add aliases to many functions +- Add full support for line and inline comments +- Add params to function representations +- Add docstring to functions + +### 0.4.0 (2022-08-25) +- Rewrite a lot of the code +- Add integer and big integer support +- Add tail call optimization (TCO) +- Add macro support + +### 0.3.2 (2022-07-02) +- Add new functions + +### 0.3.1 (2022-06-06) +- Rewrite parts of the code +- Add new functions and examples + +### 0.3.0 (2022-12-12) +- Rewrite the evaluation code +- Add new functions +- Add a core library + +### 0.2.0 (2021-12-04) +The whole implementation was refactored and the parser was rewritten to use +[Nom](https://github.com/Geal/nom). This allowed the addition of strings to the +language and reading from the filesystem. + +### 0.1.0 (2021-07-21) +MOROS Lisp started from [Risp](https://github.com/stopachka/risp) and was +extended to include the seven primitive operators and the two special forms of +John McCarthy's paper "Recursive Functions of Symbolic Expressions and Their +Computation by Machine" (1960) and "The Roots of Lisp" (2002) by Paul Graham. diff --git a/doc/manual.md b/doc/manual.md index 5413777..4294106 100644 --- a/doc/manual.md +++ b/doc/manual.md @@ -42,8 +42,7 @@ The first time MOROS will boot in diskless mode where you can use the builtin commands to test the system or `install` to setup the [filesystem](filesystem.md) on a disk: - MFS is not mounted to '/' - Running console in diskless mode + Warning: MFS not found, run 'install' to setup the system / > install @@ -54,6 +53,7 @@ commands to test the system or `install` to setup the Listing disks ... Path Name (Size) /dev/ata/0/0 QEMU HARDDISK QM00001 (32 MB) + /dev/mem RAM DISK Formatting disk ... Enter path of disk to format: /dev/ata/0/0 @@ -72,10 +72,17 @@ commands to test the system or `install` to setup the Created '/var' Copied '/bin/clear' Copied '/bin/halt' - Copied '/bin/hello' + Copied '/bin/ntp' Copied '/bin/print' Copied '/bin/reboot' Copied '/bin/sleep' + Created '/dev/ata' + Created '/dev/ata/0' + Created '/dev/ata/0/0' + Created '/dev/ata/0/1' + Created '/dev/ata/1' + Created '/dev/ata/1/0' + Created '/dev/ata/1/1' Created '/dev/clk' Created '/dev/clk/uptime' Created '/dev/clk/realtime' @@ -83,23 +90,29 @@ commands to test the system or `install` to setup the Created '/dev/null' Created '/dev/random' Created '/dev/console' + Created '/dev/net' + Created '/dev/net/tcp' + Created '/dev/net/udp' Copied '/ini/banner.txt' Copied '/ini/boot.sh' + Copied '/ini/lisp.lsp' Copied '/ini/shell.sh' Copied '/ini/version.txt' Created '/ini/palettes' - Copied '/ini/palettes/gruvbox-dark.csv' - Copied '/ini/palettes/gruvbox-light.csv' + Copied '/ini/palettes/gruvbox-dark.sh' + Copied '/ini/palettes/gruvbox-light.sh' Created '/ini/fonts' Copied '/ini/fonts/zap-light-8x16.psf' Copied '/ini/fonts/zap-vga-8x16.psf' Created '/lib/lisp' - Copied '/lib/lisp/core.lsp' Copied '/lib/lisp/alias.lsp' + Copied '/lib/lisp/core.lsp' + Copied '/lib/lisp/file.lsp' Copied '/tmp/alice.txt' Copied '/tmp/machines.txt' Created '/tmp/lisp' Copied '/tmp/lisp/colors.lsp' + Copied '/tmp/lisp/doc.lsp' Copied '/tmp/lisp/factorial.lsp' Copied '/tmp/lisp/fibonacci.lsp' Copied '/tmp/lisp/geotime.lsp' @@ -119,8 +132,10 @@ commands to test the system or `install` to setup the Copied '/tmp/beep/tetris.sh' Copied '/tmp/beep/starwars.sh' Copied '/tmp/beep/mario.sh' + Created '/var/log' Created '/var/www' Copied '/var/www/index.html' + Copied '/var/www/moros.css' Copied '/var/www/moros.png' Creating user... @@ -137,7 +152,8 @@ diskless mode and let MOROS run the bootscript `/ini/boot.sh` to login and use the shell. If no disks were detected or if you prefer not to use any you can mount the -system in memory and use a virtual disk with `memory format` before `install`. +system in memory and use a virtual disk with `memory format` before `install` +or using `/dev/mem` for the disk during the setup. ## Shell @@ -188,10 +204,11 @@ The command has some options to sort the results: Usage: list [] Options: - -a, --all Show dot files - -n, --name Sort by name - -s, --size Sort by size - -t, --time Sort by time + -b, --binary-size Use binary size + -a, --all Show dot files + -n, --name Sort by name + -s, --size Sort by size + -t, --time Sort by time You can write a directory in the disk with `write`: @@ -228,7 +245,7 @@ content to the file and `^Q` to quit the editor and go back to the shell. The `help` command has a subcommand `help edit` to list the editor commands: > help edit - MOROS text editor is a very simple editor inspired by Pico, Nano, and Micro. + MOROS text editor is a very simple editor inspired by Pico. Commands: ^Q Quit editor @@ -270,8 +287,8 @@ You can also set the `TZ` environment variable to use your preferred timezone: Add `env TZ 7200` to `/ini/boot.sh` before `shell` to save the timezone: > read /ini/boot.sh - vga set palette /ini/palettes/gruvbox-dark.csv vga set font /ini/fonts/zap-light-8x16.psf + shell /ini/palettes/gruvbox-dark.sh read /ini/banner.txt user login env TZ 7200 @@ -353,3 +370,10 @@ Or the more specialized `http` command to request a document from a web server:

MOROS

+ +There is also a `ntp` script to synchronize the clock over the network: + + > ntp + 2023-03-21 10:00:00 + + > ntp => /dev/rtc diff --git a/doc/network.md b/doc/network.md index 5ff3162..122790a 100644 --- a/doc/network.md +++ b/doc/network.md @@ -69,7 +69,7 @@ The `host` command performs DNS lookups: The `tcp` command connects to TCP sockets: > tcp time.nist.gov:13 --verbose - DEBUG: Connecting to 129.6.15.30:13 + DEBUG: Connected to 129.6.15.30:13 58884 20-02-05 19:19:42 00 0 0 49.2 UTC(NIST) * diff --git a/doc/shell.md b/doc/shell.md index 29ec303..ba5a4bb 100644 --- a/doc/shell.md +++ b/doc/shell.md @@ -26,7 +26,6 @@ additional common aliases. **Delete** file: > d a.txt - > del a.txt > delete a.txt **Copy** file: @@ -65,7 +64,7 @@ additional common aliases. When executed without arguments, this command will list the files of the current directory. -**Go to** dir: +**Goto** dir: > goto /usr/alice diff --git a/dsk/bin/exec b/dsk/bin/exec index fdbd631ae851c5e17e8fdb3ccf9628bf044fe301..4002e1ccf2b8016b7e4ec4fcee7d8ac2a022399c 100644 GIT binary patch delta 3877 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 delta 3882 zcmb7HeNa@_6~FK8t}b7`T?Kdf+y|}(goOoM@C#*wm={^C5d;)*%uGYgs1+$RHcj2N zpq&+Wf;rQPHf9=|w29SJ%(iF~gBTRlSq(9UT3ai$Vfw(2qBw}LaeMCjAc+3cJ9FN- z=XcIM_niB2-g{jiF@qm5O=e@$OrFq|FFgrq-jlL9BoHl2fjtLIOS%-HD}|R(l{;q3 zMk*%;S!R$;K+>;}Wql1Vb@VmBGBezUQW-YvlwpC)DA#>Hwa%G%H3EvaVQv;TG;2={C`?R}ZKbz_nF^fH!gp_3yau_Ln79kV^>{C7~ zi;(w_s!?u7JBq1fL5x8PQ}`CtZ9r;7+Jm$WY5jac-X25aWCzjaJ#LhR^6T>mc?*g1 zRHR>{gM&ydNbN{)N}C5^S`N-?cDV^jb`p|>&zC|osh_Wu7x8B(d-|!a6Ta>L!W@gVZx4J-9&MtMd~-!T4#%c@w6X!to3h* z_D`{FVxZbF*YqqNGQoGkdK{ak2BAqT`>H?ZhiFIOYDxLGlbm|JGO-p3AUi2@X_8t>n!y(ji9)s3j@DE$} zF_Uj$c*2f0t|1&Rq^r?UxBw2!NM)Oi{);pAvDw#hF#}p5#MmS$NN=1~=%nj`jV{H# zNy_*sxbryPH4lE3lEk)6g4UFn$!qW`;b{=+Pa7(nYb*Qjjle+4zuZCeni0h7w{`k+*ViW)z5MRH1i9p-1vA`=Tl-M0ZBKp+di>5DgjEP5eql538v7nZ>P4 z`e4-G5!LL`D70UN8r6~1-%b_vsi^oP6^fyd6ibf^z3-r5d@gu9M3JQo2tlRiBp2Cs&=^lmT+ zL+QKNj8JfA*utBzbjut2>S;Khks8yF!7SohW~CH14A(^p-c!PKYL0)cqWv|J8h}!8>bK@2sv4L8RJ)$)SbZR6KNblP)?%{xBEsMXOR;(6E z)YlermV6p#1q!2aE|Ua|vs>`x6-aIzXR)#g-m7AB7&WZ>VTbM+RNzXS<}2FKEKW8% zpqP1Ov*$W=gql56>@eFHH2%6Z7%axJ5=h5mAl1TMW?Zf?R280-YTnk_8e_$CYvZb-h z;@?Q$q}_ZAufvvf3mb@oH_~S$HsCgMVd5>kX^*`C^0}5yJj}hVFem9ZY-KB4ODYBr zpB?{V23-u7bvcayD{hIkoQk+@5mh$m;#W@k55})pL}c3_J2A6}x5IyagEZhA zS?rAwC~(-Uczp!Hdmr&7X>@9=!`T1b0G$Z$2lkWFpk!8-yPH(+6{z8C5}fAa&rj>AiU$91Sl5^L{s$8x=QoAtM4t?|1XqUce{E6T{Ks`RJn z^|#x(V`ZT?KQN>F?+kFZ+6UY*lXvj8f9aebGYKM%x07C!tdn%r=v%iBJ6xE{H@(*1 zJ9mI#jPC~KGfW>`$V4vete$u$1M$LUv{!Q-5OFX zJqh_Ka;)BDJnlgZKPN~}HjhtwdF7^ZkHAYngGT1cS2XEEG!dx*wy!WnkJm24;ZdmV zhNGzMR>rPGgtmo9AxI6-`;@VE9BY-d#^NVEN1>J;x(0AQMH`RWB-D1pmSR)v_<04? z(0SYPcnF%K=Je$8C=t@7@Nh|@ALUA0z)PLM`7&=-?Cfv{=eBEQl-_;XoJjb=L+p@P zVsdvWTGiJjMaBT7_T@Nvy#09nWyM~rjK8ADibzzM{_0>`P5z-6M9KiUtH@YEr1n6O z@ykhSdL1uux^1+@E3&$28!1K!dP_{t4@U9WCqzwtt0HfeP&^u#w+{P*CSE~grpoHF zc)+>R%Z$`!Dsqw{uTf+yu~Ms1tKqL&N?C5m-e_qM*$Xe1xBPxZId0Y}R+ zLPvixSHM77PDoFkJfsIw%5y{2$qc2C7(Ep{<-Ac1%veg}!4nBb%X3*{DGZb^2wA0o JWw52(@;~c8) diff --git a/dsk/bin/halt b/dsk/bin/halt index 98f579f693ad9342285b912a8bd91a9af79c85ee..98a20d7d76e35fde756056b5da406003dae81049 100644 GIT binary patch delta 111 zcmZ3$xq)+n2IGf`n#(z7GC;u0jW=Z(4P=0vvke}-re*K{|KGs^4f+H|L^2 zRtpTiq1z#IO=GQXf=v_KnRFzZA<;<)#0UY2k|ETpl@X}vNAG)cJp1*^HCV^P;|CmK#Zkt@N7-rP_=a< zT5SRQ!0q5}@L#|$gO7pFfiL`@Y%QFPiN9q`d7^Cqc(1&OTNIa{ZCuQl0_3=xF=r8D z2f&2I81f)&sj&SUT#hl>Oy!{Fu75uqCaaUIc@fYHUwt@q(gBaQw;w$!x)mQyzovD? zXkEWT@!`o6aNut_8cNnsl7RL1*fZ)ZrhgF?-?YG4IJPkgUNI*?*8r9XQ_oSWy-_o+>t6 z&v4PiW5vYvOQEFOjqn9nD1?7j%=fu+q}zDE%bvI&(Ks_$llTqGHvMpN&kg>u>w>=) zaB;YJD)f=qTlCUkBJZ2X2e?E1PAWWTLg!|nf0)pp2$IR`k0$gnLDVtrNQa4DG11Vr zWV|dmxdB@xEIVI zL;=>0a{V-!Pke78W(mS3*I4*Vx%qMLj)ucW=<%G4OXMHs=2?!^U~1Js_=3DHX&!$z zuP}~%X71p;5q>(aAPouX)xO2~4ee9DBuyXG2G7T8QPy3B+>yUYE_^5WWd0T@&Yo|! z*ObUVz0=_z#Nmxh|HTAjMTTaeJpvjVyI*U&;?(pn_c#BIVQy;2Uuk8#l*j2}bqx5L z57Yf99=NKhz19Z-`c~ist`^r0r?F*N(J+?Suu=z!$0ceAcZ$6xGwg!asoX)HfgP^+ z&;>mFm+jrxyOCWbv~61Q{s&)K?eL&TucT(-*9fK5L)K~BTD5%?3DrL3GL-fK@5Srg zQ2r$p-}TFrVTb06fbeZr$t@sp!yvzpp; zwY0d^tafr_qT$U;d1pbEUxS;sLCvb8wyL1awB;5GwWS5Bb40eX3aqxK|1;Eti`PEj z``M5Z0|UJv&J9Q5cC(U-mL(W&`4P93L&`ZA*q4SMW@m@<`D5YmIvnbaw1r?6`iY9w z!8xy9K17d=Z9Q4Att`}JTJ|6auS<6>u5LiFP$9fVYCqm~7Fueh_^~nm_l&xfZP;M+8KvQQ2uOU5qqgM0+oA;r z3PqY*gjYv27bRM-rIST8NAD5J@`V{&w8FjRn4ZPn8uYa`IR(x+-0kGe>xK^;x-Kgv&K$(pS8qCQrJ; ze^hgq^bG%VO|^8GpQ-Unm3(8ZUpgE-Q#%&z&y$^4v{^EB`Xh|UZP>BKf|eUP{iYJF zHFR2fq6Z9}ZYR-$bM!g>{%<)n838zSg6iB(Ah-!S}fv;@tIis1Nh7c_3@ z_Zj*{$ZT)~=gAF;_sn%!jT#ibFxrVPW9!71F}#V)0-lT48u&PWq9G-1ZZ>*DT<{p@ zJ>Oxq!AiGgoWIwQ;-4GqfOX+_R9tCPoZE?J;5#dw7|jyW2zt)IyA5gXnj!6Mz%U%D zaEgGR8~P5uYeh=h4r4*+z7Q<~r-OI!-W4hLoG`5SlL_=|a29wjz7rV!;9w<+6W`h8 zeH>$f^PZKP)2@EsNyZtPnF3GK9?9O>>J*l%1rgb5=;s{aCnX4>tvkf3+?W2?%g?Yw7Itu)Bbugd)|SpFaD delta 3316 zcmb7HeNa@_6~FH-FD%OX!0@pku#d0<3-YxnFv_P1gcn^BqgahrF|A_SCUJ zne)y)zjN-n=iHC8aP|%E&=JmOd=RKkp)P4po59_@CgPXwH!F#|jgI@>tfCK+0e>KPd z!kjUSGY)37WJ|?!OAK3zpQAQDliuL1bj;ug{6ts~M=x+f;80={m(g8}lPx0TZB5#i z6S5xM47M!~+)j$;_*GHVWX@Xbs6~x^q@NwD>^UF4Y@iRDPnzCI0lZM|bXtqUE^1CW z!i8vWN)o@5rzcY!++LcL`bcV4wK8|rC()SvC-zaog#XCVJ*k_xK^jVxQ*DUM;uz(Q zX{Sx@thAnBYlY)DTDWAi;Eg1

9jQO9?pKS&}{1o$Xus4Uc7Mb}yIkdCLlDsa5kYJtFNRIPZRer@F zd;SqFNT7p7HTJ`2A`#h}Xu^^A+gMJgu?DL4R$Wsq3z;RJS$Y)iTrD40!h+)T%{e&^hEYW_lF2-kJzWf->qr$ZY7$)3+-PcVE}#~vxf-mzFeGShc$UqpAoXX43)^vAim zv0Fot$O+ccCSnulN4d6`Ki8tPx35Pc^kQx&XQaFH3SxV3PU;E%@)Y&w<)FKRap#AyjZaV`cEEYccptd7r zGtg@a6bh}E+b&D8=gzM;brbBf*fD|$a;LDr3Zi4cweJt?9oYx2$YQT)7eH5w>=m{# ztEbKy*D@;9V$6}CPytEg<2Mbr47Uw;46@rJTb(#H>FMAswLX-EWNx zpT>S%dZ+lFIKt_cf_}){- zMu2J=0xKg;w5SEtR1#_{%y7rS?yMIrwJc8ql$kuIE0}^jzeFdv1V#3i?#pHAoC{0% z!G!Jkpzs+C*ok3j%Mjd#RktTKw_8{eZVf@f&)n{4eyBDT&SWGK*@0KEAH7L!JS)*; zl*aQkOt8GjEK1{%bj$T1vzW%vs2pD5F}4sokJyh!O~MOAHeYX@wPN2WT)zs^?u_5@ zPX%eCDlw2XQGibP;+5@=h0-?s%n*GbZ3BPUMz^L}7kwW->|Bd+ z#y7I*FVae)PT$5O8%Zn7lx5Eiz~{167bC_kmsogQXN*6}ro)yJclJUhtUMH|J@8+* zGX~WL+in_N+r?u~EbyGV?3Y|3?kq0kluuEeH^gJ*o@+hEN!1!Zd!aQujFM(dXlW_D zpWQe)Bp%zi;IiM0@UsqB&3Q{amh8DQ8ECX;aNN`M*^(99hk>q=2+tV;U8VT~|Ly6( znUza;e)3a#wemcF_fz_}s#5MR)L3ofKBo5SN^Tc@zPgI*rtep~xm=oGC#s#DS*$Q%5|!lj6-IEeYCYc`LX%d z$1xp0vE&QstnB{ysQuAo_x!o( zus(F36&th_=VvHucu%>6(JUd1LSq^}ph;X+h0tgjrIIU};X;|DAivf0O8PaDuZ&Vr z_Cy)20xtnq()fmC_XW+W1tZ^Ry1w|udHQ_+`S!nS{!wfxP*~GdZB}Q0%!4+QNzDO& zPbtI;k|Lv3mBeT|x`sk#O=oA#s6f;8^L`c>yIlpewV^phdR)SImh`g5=tRS=%$|Lc zVv1{2<$-Ed`ZfIJK&w2;aU*oa>Y|w0e>qxLm&Y7!=q3IL+^y=#Jcs*=4J6X^e TU9qMdFQ#=(4R@9HuF3fyvdBGS diff --git a/dsk/bin/ntp b/dsk/bin/ntp index d0584bf..8e6ac9d 100644 --- a/dsk/bin/ntp +++ b/dsk/bin/ntp @@ -17,5 +17,5 @@ (var res (file/read socket 48)) (var buf (slice res 40 4)) -(var time (- (bin->num (concat '(0 0 0 0) buf) "int") 2208988800)) -(print (date time)) +(var num (- (bin->num (concat '(0 0 0 0) buf) "int") 2208988800)) +(print (date num)) diff --git a/src/sys/fs/device.rs b/src/sys/fs/device.rs index 7708b42..57b3cb3 100644 --- a/src/sys/fs/device.rs +++ b/src/sys/fs/device.rs @@ -35,17 +35,17 @@ impl TryFrom<&[u8]> for DeviceType { type Error = (); fn try_from(buf: &[u8]) -> Result { - match buf.get(0) { - Some(i) if *i == DeviceType::Null as u8 => Ok(DeviceType::Null), - Some(i) if *i == DeviceType::File as u8 => Ok(DeviceType::File), - Some(i) if *i == DeviceType::Console as u8 => Ok(DeviceType::Console), - Some(i) if *i == DeviceType::Random as u8 => Ok(DeviceType::Random), - Some(i) if *i == DeviceType::Uptime as u8 => Ok(DeviceType::Uptime), - Some(i) if *i == DeviceType::Realtime as u8 => Ok(DeviceType::Realtime), - Some(i) if *i == DeviceType::RTC as u8 => Ok(DeviceType::RTC), - Some(i) if *i == DeviceType::TcpSocket as u8 => Ok(DeviceType::TcpSocket), - Some(i) if *i == DeviceType::UdpSocket as u8 => Ok(DeviceType::UdpSocket), - Some(i) if *i == DeviceType::Drive as u8 => Ok(DeviceType::Drive), + match buf.get(0).ok_or(())? { + 0 => Ok(DeviceType::Null), + 1 => Ok(DeviceType::File), + 2 => Ok(DeviceType::Console), + 3 => Ok(DeviceType::Random), + 4 => Ok(DeviceType::Uptime), + 5 => Ok(DeviceType::Realtime), + 6 => Ok(DeviceType::RTC), + 7 => Ok(DeviceType::TcpSocket), + 8 => Ok(DeviceType::UdpSocket), + 9 => Ok(DeviceType::Drive), _ => Err(()), } } @@ -90,35 +90,17 @@ impl TryFrom<&[u8]> for Device { type Error = (); fn try_from(buf: &[u8]) -> Result { - match buf.try_into() { - Ok(DeviceType::Null) => { - Ok(Device::Null) - } - Ok(DeviceType::File) => { - Ok(Device::File(File::new())) - } - Ok(DeviceType::Console) => { - Ok(Device::Console(Console::new())) - } - Ok(DeviceType::Random) => { - Ok(Device::Random(Random::new())) - } - Ok(DeviceType::Uptime) => { - Ok(Device::Uptime(Uptime::new())) - } - Ok(DeviceType::Realtime) => { - Ok(Device::Realtime(Realtime::new())) - } - Ok(DeviceType::RTC) => { - Ok(Device::RTC(RTC::new())) - } - Ok(DeviceType::TcpSocket) => { - Ok(Device::TcpSocket(TcpSocket::new())) - } - Ok(DeviceType::UdpSocket) => { - Ok(Device::UdpSocket(UdpSocket::new())) - } - Ok(DeviceType::Drive) if buf.len() > 2 => { + match buf.try_into()? { + DeviceType::Null => Ok(Device::Null), + DeviceType::File => Ok(Device::File(File::new())), + DeviceType::Console => Ok(Device::Console(Console::new())), + DeviceType::Random => Ok(Device::Random(Random::new())), + DeviceType::Uptime => Ok(Device::Uptime(Uptime::new())), + DeviceType::Realtime => Ok(Device::Realtime(Realtime::new())), + DeviceType::RTC => Ok(Device::RTC(RTC::new())), + DeviceType::TcpSocket => Ok(Device::TcpSocket(TcpSocket::new())), + DeviceType::UdpSocket => Ok(Device::UdpSocket(UdpSocket::new())), + DeviceType::Drive if buf.len() > 2 => { let bus = buf[1]; let dsk = buf[2]; if let Some(drive) = Drive::open(bus, dsk) { diff --git a/src/sys/net/mod.rs b/src/sys/net/mod.rs index e5c5e7c..e7271ce 100644 --- a/src/sys/net/mod.rs +++ b/src/sys/net/mod.rs @@ -259,16 +259,10 @@ pub fn init() { *NET.lock() = Some((iface, device)); } }; - if let Some(io_base) = find_pci_io_base(0x10EC, 0x8139) { - add( - EthernetDevice::RTL8139(nic::rtl8139::Device::new(io_base)), - "RTL8139", - ); + if let Some(io) = find_pci_io_base(0x10EC, 0x8139) { + add(EthernetDevice::RTL8139(nic::rtl8139::Device::new(io)), "RTL8139"); } - if let Some(io_base) = find_pci_io_base(0x1022, 0x2000) { - add( - EthernetDevice::PCNET(nic::pcnet::Device::new(io_base)), - "PCNET", - ); + if let Some(io) = find_pci_io_base(0x1022, 0x2000) { + add(EthernetDevice::PCNET(nic::pcnet::Device::new(io)), "PCNET"); } } diff --git a/src/usr/shell.rs b/src/usr/shell.rs index 4c5cce1..59dd300 100644 --- a/src/usr/shell.rs +++ b/src/usr/shell.rs @@ -575,7 +575,9 @@ fn dispatch(args: &[&str], config: &mut Config) -> Result<(), ExitCode> { config.env.insert("DIR".to_string(), sys::process::dir()); Ok(()) } - Some(FileType::File) => spawn(&path, args, config), + Some(FileType::File) => { + spawn(&path, args, config) + } _ => { let path = format!("/bin/{}", args[0]); spawn(&path, args, config) @@ -585,7 +587,11 @@ fn dispatch(args: &[&str], config: &mut Config) -> Result<(), ExitCode> { } } -fn spawn(path: &str, args: &[&str], config: &mut Config) -> Result<(), ExitCode> { +fn spawn( + path: &str, + args: &[&str], + config: &mut Config +) -> Result<(), ExitCode> { // Script if let Ok(contents) = fs::read_to_string(path) { if contents.starts_with("#!") { diff --git a/www/editor.html b/www/editor.html index d4ca7de..25c666a 100644 --- a/www/editor.html +++ b/www/editor.html @@ -19,9 +19,9 @@

  • CTRL + E to move cursor to enf of line
  • CTRL + T to move cursor to begining of file
  • CTRL + B to move cursor to enf of file
    • -
  • CTRL + d to cut (delete) a line
    • -
  • CTRL + y to copy (yank) a line
    • -
  • CTRL + p to paste (put) a line
    • +
  • CTRL + D to cut (delete) a line
    • +
  • CTRL + Y to copy (yank) a line
    • +
  • CTRL + P to paste (put) a line
    • diff --git a/www/filesystem.html b/www/filesystem.html index c15edac..3641176 100644 --- a/www/filesystem.html +++ b/www/filesystem.html @@ -126,8 +126,8 @@ alloc = number of allocated blocks

    File

    -

    The first block of a contains the address of the next block where its contents -is stored and the beginning of its contents in the rest of the block.

    +

    The first block of a file contains the address of the next block where its +contents is stored and the beginning of its contents in the rest of the block.

    If all contents can fit into one block the address of the next block will be empty.

    diff --git a/www/lisp.html b/www/lisp.html index c87c166..8a70384 100644 --- a/www/lisp.html +++ b/www/lisp.html @@ -119,7 +119,7 @@ of the Shell.

    The interpreter can be invoked from the shell:

    > lisp
-MOROS Lisp v0.5.0
+MOROS Lisp v0.7.0
 
 > (+ 1 2 3)
 6
@@ -194,64 +194,9 @@ with the following content:
    
 
     
    Changelog
    
 
-    
    0.1.0 (2021-07-21)
    
-
-    
    MOROS Lisp started from Risp and was
-extended to include the seven primitive operators and the two special forms of
-John McCarthy's paper "Recursive Functions of Symbolic Expressions and Their
-Computation by Machine" (1960) and "The Roots of Lisp" (2002) by Paul Graham.
    
-
-    
    0.2.0 (2021-12-04)
    
-
-    
    The whole implementation was refactored and the parser was rewritten to use
-    Nom. This allowed the addition of strings to the
-language and reading from the filesystem.
    
-
-    
    0.3.0 (2022-12-12)
    
-
-    
      
-    
    • Rewrite the evaluation code
      • 
-    
    • Add new functions
      • 
-    
    • Add a core library
      • 
-    
    
-
-    
    0.3.1 (2022-06-06)
    
-
-    
      
-    
    • Rewrite parts of the code
      • 
-    
    • Add new functions and examples
      • 
-    
    
-
-    
    0.3.2 (2022-07-02)
    
-
-    
      
-    
    • Add new functions
      • 
-    
    
-
-    
    0.4.0 (2022-08-25)
    
-
-    
      
-    
    • Rewrite a lot of the code
      • 
-    
    • Add integer and big integer support
      • 
-    
    • Add tail call optimization (TCO)
      • 
-    
    • Add macro support
      • 
-    
    
-
-    
    0.5.0 (2023-06-21)
    
-
-    
      
-    
    • Rename or add aliases to many functions
      • 
-    
    • Add full support for line and inline comments
      • 
-    
    • Add params to function representations
      • 
-    
    • Add docstring to functions
      • 
-    
    
-
-    
    0.6.0 (2023-09-23)
    
-
-    
      
-    
    • Add file, number, string, and regex namespaces
      • 
-    
    • Add socket functions
      • 
-    
    
+    
 
     
    0.7.0 (2023-12-22)
    
 
@@ -265,7 +210,64 @@ language and reading from the filesystem.
    
     
  • Add number->string (aliased to num->str) with an optional radix argument
    • 
     
 
-    
    Unreleased
    
+    
    0.6.0 (2023-09-23)
    
+
+    
      
+    
    • Add file, number, string, and regex namespaces
      • 
+    
    • Add socket functions
      • 
+    
    
+
+    
    0.5.0 (2023-06-21)
    
+
+    
      
+    
    • Rename or add aliases to many functions
      • 
+    
    • Add full support for line and inline comments
      • 
+    
    • Add params to function representations
      • 
+    
    • Add docstring to functions
      • 
+    
    
+
+    
    0.4.0 (2022-08-25)
    
+
+    
      
+    
    • Rewrite a lot of the code
      • 
+    
    • Add integer and big integer support
      • 
+    
    • Add tail call optimization (TCO)
      • 
+    
    • Add macro support
      • 
+    
    
+
+    
    0.3.2 (2022-07-02)
    
+
+    
      
+    
    • Add new functions
      • 
+    
    
+
+    
    0.3.1 (2022-06-06)
    
+
+    
      
+    
    • Rewrite parts of the code
      • 
+    
    • Add new functions and examples
      • 
+    
    
+
+    
    0.3.0 (2022-12-12)
    
+
+    
      
+    
    • Rewrite the evaluation code
      • 
+    
    • Add new functions
      • 
+    
    • Add a core library
      • 
+    
    
+
+    
    0.2.0 (2021-12-04)
    
+
+    
    The whole implementation was refactored and the parser was rewritten to use
+    Nom. This allowed the addition of strings to the
+language and reading from the filesystem.
    
+
+    
    0.1.0 (2021-07-21)
    
+
+    
    MOROS Lisp started from Risp and was
+extended to include the seven primitive operators and the two special forms of
+John McCarthy's paper "Recursive Functions of Symbolic Expressions and Their
+Computation by Machine" (1960) and "The Roots of Lisp" (2002) by Paul Graham.
    
   
   
 
diff --git a/www/manual.html b/www/manual.html
index 34a7837..e17a403 100644
--- a/www/manual.html
+++ b/www/manual.html
@@ -51,8 +51,7 @@ memory size, processor, devices, network cards, disks, and the real time clock.<
 commands to test the system or install to setup the
     filesystem on a disk:
    
 
-    
    MFS is not mounted to '/'
-Running console in diskless mode
+    
    Warning: MFS not found, run 'install' to setup the system
 
 /
 > install
@@ -63,6 +62,7 @@ Proceed? [y/N] y
 Listing disks ...
 Path            Name (Size)
 /dev/ata/0/0    QEMU HARDDISK QM00001 (32 MB)
+/dev/mem        RAM DISK
 
 Formatting disk ...
 Enter path of disk to format: /dev/ata/0/0
@@ -81,10 +81,17 @@ Created '/usr'
 Created '/var'
 Copied '/bin/clear'
 Copied '/bin/halt'
-Copied '/bin/hello'
+Copied '/bin/ntp'
 Copied '/bin/print'
 Copied '/bin/reboot'
 Copied '/bin/sleep'
+Created '/dev/ata'
+Created '/dev/ata/0'
+Created '/dev/ata/0/0'
+Created '/dev/ata/0/1'
+Created '/dev/ata/1'
+Created '/dev/ata/1/0'
+Created '/dev/ata/1/1'
 Created '/dev/clk'
 Created '/dev/clk/uptime'
 Created '/dev/clk/realtime'
@@ -92,23 +99,29 @@ Created '/dev/rtc'
 Created '/dev/null'
 Created '/dev/random'
 Created '/dev/console'
+Created '/dev/net'
+Created '/dev/net/tcp'
+Created '/dev/net/udp'
 Copied '/ini/banner.txt'
 Copied '/ini/boot.sh'
+Copied '/ini/lisp.lsp'
 Copied '/ini/shell.sh'
 Copied '/ini/version.txt'
 Created '/ini/palettes'
-Copied '/ini/palettes/gruvbox-dark.csv'
-Copied '/ini/palettes/gruvbox-light.csv'
+Copied '/ini/palettes/gruvbox-dark.sh'
+Copied '/ini/palettes/gruvbox-light.sh'
 Created '/ini/fonts'
 Copied '/ini/fonts/zap-light-8x16.psf'
 Copied '/ini/fonts/zap-vga-8x16.psf'
 Created '/lib/lisp'
-Copied '/lib/lisp/core.lsp'
 Copied '/lib/lisp/alias.lsp'
+Copied '/lib/lisp/core.lsp'
+Copied '/lib/lisp/file.lsp'
 Copied '/tmp/alice.txt'
 Copied '/tmp/machines.txt'
 Created '/tmp/lisp'
 Copied '/tmp/lisp/colors.lsp'
+Copied '/tmp/lisp/doc.lsp'
 Copied '/tmp/lisp/factorial.lsp'
 Copied '/tmp/lisp/fibonacci.lsp'
 Copied '/tmp/lisp/geotime.lsp'
@@ -128,8 +141,10 @@ Created '/tmp/beep'
 Copied '/tmp/beep/tetris.sh'
 Copied '/tmp/beep/starwars.sh'
 Copied '/tmp/beep/mario.sh'
+Created '/var/log'
 Created '/var/www'
 Copied '/var/www/index.html'
+Copied '/var/www/moros.css'
 Copied '/var/www/moros.png'
 
 Creating user...
@@ -147,7 +162,8 @@ diskless mode and let MOROS run the bootscript /ini/boot.sh to logi
 the shell.
    
 
     
    If no disks were detected or if you prefer not to use any you can mount the
-system in memory and use a virtual disk with memory format before install.
    
+system in memory and use a virtual disk with memory format before install
+or using /dev/mem for the disk during the setup.
    
 
     
    Shell
    
 
@@ -202,10 +218,11 @@ tilde ~ means that you are in your home directory:
    
 Usage: list <options> [<dir>]
 
 Options:
-  -a, --all     Show dot files
-  -n, --name    Sort by name
-  -s, --size    Sort by size
-  -t, --time    Sort by time
+  -b, --binary-size   Use binary size
+  -a, --all           Show dot files
+  -n, --name          Sort by name
+  -s, --size          Sort by size
+  -t, --time          Sort by time
 
    
 
     
    You can write a directory in the disk with write:
    
@@ -246,7 +263,7 @@ content to the file and ^Q to quit the editor and go back to the sh
     
    The help command has a subcommand help edit to list the editor commands:
    
 
     
    > help edit
-MOROS text editor is a very simple editor inspired by Pico, Nano, and Micro.
+MOROS text editor is a very simple editor inspired by Pico.
 
 Commands:
   ^Q    Quit editor
@@ -292,8 +309,8 @@ file:
    
     
    Add env TZ 7200 to /ini/boot.sh before shell to save the timezone:
    
 
     
    > read /ini/boot.sh
-vga set palette /ini/palettes/gruvbox-dark.csv
 vga set font /ini/fonts/zap-light-8x16.psf
+shell /ini/palettes/gruvbox-dark.sh
 read /ini/banner.txt
 user login
 env TZ 7200
@@ -382,6 +399,14 @@ Hello, World!
     <h1>MOROS</h1>
   </body>
 </html>
+
    
+
+    
    There is also a ntp script to synchronize the clock over the network:
    
+
+    
    > ntp
+2023-03-21 10:00:00
+
+> ntp => /dev/rtc
 
    
   
   
diff --git a/www/network.html b/www/network.html
index ca15ae9..b809c42 100644
--- a/www/network.html
+++ b/www/network.html
@@ -83,7 +83,7 @@ dns: 10.0.2.3
     
    The tcp command connects to TCP sockets:
    
 
     
    > tcp time.nist.gov:13 --verbose
-DEBUG: Connecting to 129.6.15.30:13
+DEBUG: Connected to 129.6.15.30:13
 
 58884 20-02-05 19:19:42 00 0 0  49.2 UTC(NIST) *
 
    
diff --git a/www/shell.html b/www/shell.html
index eef7adf..fb40b80 100644
--- a/www/shell.html
+++ b/www/shell.html
@@ -33,7 +33,6 @@ additional common aliases.
    
     
    Delete file:
    
 
     
    > d a.txt
-> del a.txt
 > delete a.txt
 
    
 
@@ -80,7 +79,7 @@ additional common aliases.
    
     
    When executed without arguments, this command will list the files of the
 current directory.
    
 
-    
    Go to dir:
    
+    
    Goto dir:
    
 
     
    > goto /usr/alice