diff --git a/LICENSE b/LICENSE
index 0d4046d..e62ec04 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,37 +1,674 @@
-==================================================================
-MikeOS -- License
-==================================================================
+GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
-Copyright (C) 2006 - 2020 MikeOS Developers -- http://mikeos.sourceforge.net
+ Preamble
-All rights reserved.
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
- * Neither the name MikeOS nor the names of any MikeOS contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
-THIS SOFTWARE IS PROVIDED BY MIKEOS DEVELOPERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL MIKEOS DEVELOPERS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
-==================================================================
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program 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
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ Copyright (C)
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+.
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..7d1891b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,25 @@
+ASM=nasm
+
+SRC_DIR=source
+BUILD_DIR=disk_images
+DATA_DIR=data
+
+# Floppy image
+# Fat12
+floppy_image: $(BUILD_DIR)/crawos.img
+$(BUILD_DIR)/crawos.img: bootloader kernel
+ dd if=/dev/zero of=$(BUILD_DIR)/crawos.img bs=512 count=2880 # Use dd to make a disk image
+ mkfs.fat -F 12 -n "CRAWOS" $(BUILD_DIR)/crawos.img # Format the disk image with fat12
+ dd if=$(BUILD_DIR)/boot.bin of=$(BUILD_DIR)/crawos.img conv=notrunc # Put boot.bin inside the disk image
+ mcopy -i $(BUILD_DIR)/crawos.img $(BUILD_DIR)/kernel.bin "::kernel.bin" # Put kernel.bin inside the disk image
+ for filename in $(DATA_DIR)/*; do mcopy -i $(BUILD_DIR)/crawos.img $$filename "::/$$(echo $$filename | xargs -n 1 basename)"; done
+
+# Bootloader
+bootloader: $(BUILD_DIR)/boot.bin
+$(BUILD_DIR)/boot.bin:
+ $(ASM) $(SRC_DIR)/bootload/boot.asm -f bin -o $ $(BUILD_DIR)/boot.bin
+
+# Kernel
+kernel: $(BUILD_DIR)/kernel.bin
+$(BUILD_DIR)/kernel.bin:
+ $(ASM) $(SRC_DIR)/kernel/kernel.asm -f bin -o $ $(BUILD_DIR)/kernel.bin
diff --git a/build-linux.sh b/build-linux.sh
index a3a62a3..86e62f2 100755
--- a/build-linux.sh
+++ b/build-linux.sh
@@ -1,14 +1,3 @@
-#!/bin/sh
-
-# This script assembles the CrawOS bootloader, kernel and programs
-# with NASM, and then creates floppy and CD images (on Linux)
-
-# Only the root user can mount the floppy disk image as a virtual
-# drive (loopback mounting), in order to copy across the files
-
-# (If you need to blank the floppy image: 'mkdosfs disk_images/crawos.flp')
-
-
if test "`whoami`" != "root" ; then
echo "You must be logged in as root to build (for loopback mounting)"
echo "Enter 'su' or 'sudo bash' to switch to root"
@@ -34,10 +23,6 @@ cd source
nasm -O0 -w+orphan-labels -f bin -o kernel.bin kernel.asm || exit
cd ..
-
-echo ">>> Assembling programs..."
-
-
echo ">>> Adding bootloader to floppy image..."
dd status=noxfer conv=notrunc if=source/bootload/bootload.bin of=disk_images/crawos.flp || exit
@@ -49,6 +34,7 @@ rm -rf tmp-loop
mkdir tmp-loop && mount -o loop -t vfat disk_images/crawos.flp tmp-loop && cp source/kernel.bin tmp-loop/
+cp data/*
sleep 0.2
@@ -62,9 +48,9 @@ rm -rf tmp-loop
echo ">>> Creating CD-ROM ISO image..."
rm -f disk_images/crawos.iso
-mkisofs -quiet -V 'MIKEOS' -input-charset iso8859-1 -o disk_images/crawos.iso -b crawos.flp disk_images/ || exit
+mkisofs -quiet -V 'CRAWOS' -input-charset iso8859-1 -o disk_images/crawos.iso -b crawos.flp disk_images/ || exit
echo '>>> Done!'
-#qemu-system-i386 -drive file=disk_images/crawos.flp,index=0,if=floppy,format=raw
+qemu-system-i386 -drive file=disk_images/crawos.flp,index=0,if=floppy,format=raw
diff --git a/build-macos.sh b/build-macos.sh
deleted file mode 100755
index 853de09..0000000
--- a/build-macos.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/bash -u
-
-if ! [ "$(id -u)" -eq 0 ]; then
- echo "[halt] Not running with superuser privileges."
- exit 1
-fi
-
-echo "[okay] running as superuser."
-
-vercomp() {
- [ "$1" = "$2" ] && return 0
-
- local IFS=.
- local i ver1=($1) ver2=($2)
- unset IFS
- if [ "${#ver1[@]}" -ne "${#ver2[@]}" ]; then
- echo "[halt] versions being compared don't have the same form!" >&2
- echo "[halt] '$1' vs '$2'" >&2
- exit 1
- fi
-
- for ((i = 0; i < ${#ver1[@]}; ++i)); do
- (( ${ver1[i]} > ${ver2[i]} )) && return 1
- (( ${ver1[i]} < ${ver2[i]} )) && return 2
- done
-
- return 0
-}
-
-nasm_version_check () {
- vercomp $1 $2
- case $? in
- 0) op='=';;
- 1) op='>';;
- 2) op='<';;
- esac
- if [ $op = '=' ] || [ $op = '>' ]; then
- echo "[okay] nasm version at least '$2'"
- return 0
- else
- echo "[halt] nasm version is too low" >&2
- return 1
- fi
-}
-
-# Main
-declare -r NASM_VER_REGEX='[0-9]+\.[0-9]+\.[0-9]+'
-declare -r MINIMUM_NASM_VERSION=2.10.09
-declare -r NASM_PATH=$(which nasm)
-
-declare current_nasm_version=
-
-if [ -z "$NASM_PATH" ]; then
- echo "[halt] nasm was not found on the system! Make sure it is named nasm and is in the path."
- exit 1
-fi
-
-current_nasm_version=$(nasm -v)
-
-[ $? -ne 0 ] && echo '[halt] error calling nasm' >&2 && exit 1
-
-if [[ "$current_nasm_version" =~ $NASM_VER_REGEX ]]; then
- current_nasm_version=${BASH_REMATCH[0]}
- echo "[okay] found current nasm version of '$current_nasm_version'"
-else
- echo "[halt] could not determine nasm version" >&2
- exit 1
-fi
-
-nasm_version_check "$current_nasm_version" "$MINIMUM_NASM_VERSION"
-
-[ $? -ne 0 ] && echo "[halt] nasm not found or version is incompatible" >&2 && exit 1
-
-"$NASM_PATH" -O0 -f bin -o source/bootload/bootload.bin source/bootload/bootload.asm || exit 1
-echo "[okay] assembled bootloader"
-
-cd source
-"$NASM_PATH" -O0 -f bin -o kernel.bin kernel.asm || exit 1
-echo "[okay] assembled kernel"
-cd ..
-
-cd programs
-for i in *.asm; do
- "$NASM_PATH" -O0 -f bin $i -o "$(basename $i .asm).bin" || exit 1
- echo "[okay] assembled program: $i"
-done
-echo "[okay] assembled all programs"
-cd ..
-
-cp disk_images/mikeos.flp disk_images/mikeos.dmg
-echo "[okay] copied floppy image"
-
-dd conv=notrunc if=source/bootload/bootload.bin of=disk_images/mikeos.dmg || exit 1
-echo "[okay] added bootloader to image"
-
-tmp_file=$(mktemp -d /tmp/$(basename $0).XXXXXX)
-[ $? -ne 0 ] && echo "[halt] error creating a temp file" >&2 && exit 1
-
-dev=$(echo -n $(hdid -nobrowse -nomount disk_images/mikeos.dmg))
-[ $? -ne 0 ] && echo "[halt] could not create disk from image" >&2 && exit 1
-
-mount -t msdos "$dev" "$tmp_file"
-[ $? -ne 0 ] && echo "[halt] could not mount "$dev"" >&2 && exit 1
-
-cp source/kernel.bin "$tmp_file/"
-cp programs/*.bin programs/*.bas programs/sample.pcx programs/vedithlp.txt programs/gen.4th programs/hello.512 "$tmp_file"
-echo "[okay] added programs to image"
-
-diskutil umount "$tmp_file"
-hdiutil detach "$dev"
-rm -rf "$tmp_file"
-echo "[okay] unmounted floppy image"
-
-rm -f disk_images/mikeos.iso
-mkisofs -quiet -V 'MIKEOS' -input-charset iso8859-1 -o disk_images/mikeos.iso -b mikeos.dmg disk_images/ || exit 1
-echo "[okay] converted floppy to ISO-8859-1 image"
-echo "[done] build completed"
diff --git a/build-openbsd.sh b/build-openbsd.sh
deleted file mode 100755
index b47967a..0000000
--- a/build-openbsd.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-# This script assembles the MikeOS bootloader, kernel and programs
-# with NASM, and then creates floppy and CD images (on OpenBSD)
-
-# Only the root user can mount the floppy disk image as a virtual
-# drive (loopback mounting), in order to copy across the files
-
-
-echo "Experimental OpenBSD build script..."
-
-
-if test "`whoami`" != "root" ; then
- echo "You must be logged in as root to build (for loopback mounting)"
- echo "Enter 'su' to switch to root"
- exit
-fi
-
-
-if [ ! -e disk_images/mikeos.flp ]
-then
- echo ">>> Creating new MikeOS floppy image..."
- dd if=/dev/zero of=disk_images/mikeos.flp bs=512 count=2880 || exit
- vnconfig vnd3 disk_images/mikeos.flp && newfs_msdos -f 1440 vnd3c && vnconfig -u vnd3 || exit
-fi
-
-
-echo ">>> Assembling bootloader..."
-
-nasm -O0 -w+orphan-labels -f bin -o source/bootload/bootload.bin source/bootload/bootload.asm || exit
-
-
-echo ">>> Assembling MikeOS kernel..."
-
-cd source
-nasm -O0 -w+orphan-labels -f bin -o kernel.bin kernel.asm || exit
-cd ..
-
-
-echo ">>> Assembling programs..."
-
-cd programs
-
-for i in *.asm
-do
- nasm -O0 -w+orphan-labels -f bin $i -o `basename $i .asm`.bin || exit
-done
-
-cd ..
-
-
-echo ">>> Adding bootloader to floppy image..."
-
-dd conv=notrunc if=source/bootload/bootload.bin of=disk_images/mikeos.flp || exit
-
-
-echo ">>> Copying MikeOS kernel and programs..."
-
-rm -rf tmp-loop
-vnconfig vnd3 disk_images/mikeos.flp || exit
-
-mkdir tmp-loop && mount -t msdos /dev/vnd3c tmp-loop && cp source/kernel.bin tmp-loop/
-
-cp programs/*.bin programs/*.bas programs/sample.pcx programs/vedithlp.txt programs/gen.4th programs/hello.512 tmp-loop
-
-echo ">>> Unmounting loopback floppy..."
-
-umount tmp-loop || exit
-
-vnconfig -u vnd3 || exit
-rm -rf tmp-loop
-
-
-echo ">>> Creating CD-ROM ISO image..."
-
-rm -f disk_images/mikeos.iso
-mkisofs -quiet -V 'MIKEOS' -r -J -o disk_images/mikeos.iso -b mikeos.flp disk_images/ || exit
-
-echo '>>> Done!'
-
diff --git a/buildwin.bat b/buildwin.bat
deleted file mode 100755
index de5693b..0000000
--- a/buildwin.bat
+++ /dev/null
@@ -1,40 +0,0 @@
-@echo off
-echo Build script for Windows
-echo.
-
-echo Assembling bootloader...
-cd source\bootload
-nasm -O0 -f bin -o bootload.bin bootload.asm
-cd ..
-
-echo Assembling MikeOS kernel...
-nasm -O0 -f bin -o kernel.bin kernel.asm
-
-echo Assembling programs...
-cd ..\programs
- for %%i in (*.asm) do nasm -O0 -f bin %%i
- for %%i in (*.bin) do del %%i
- for %%i in (*.) do ren %%i %%i.bin
-cd ..
-
-echo Adding bootsector to disk image...
-cd disk_images
-dd count=2 seek=0 bs=512 if=..\source\bootload\bootload.bin of=.\mikeos.flp
-cd ..
-
-echo Mounting disk image...
-imdisk -a -f disk_images\mikeos.flp -s 1440K -m B:
-
-echo Copying kernel and applications to disk image...
-copy source\kernel.bin b:\
-copy programs\*.bin b:\
-copy programs\sample.pcx b:\
-copy programs\vedithlp.txt b:\
-copy programs\gen.4th b:\
-copy programs\hello.512 b:\
-copy programs\*.bas b:\
-
-echo Dismounting disk image...
-imdisk -D -m B:
-
-echo Done!
diff --git a/data/hello-world.cr b/data/hello-world.cr
new file mode 100644
index 0000000..05cc6aa
--- /dev/null
+++ b/data/hello-world.cr
@@ -0,0 +1 @@
+output 'Hello World'
diff --git a/disk_images/boot.bin b/disk_images/boot.bin
new file mode 100644
index 0000000..5e6d184
Binary files /dev/null and b/disk_images/boot.bin differ
diff --git a/disk_images/crawos.flp b/disk_images/crawos.img
old mode 100755
new mode 100644
similarity index 99%
rename from disk_images/crawos.flp
rename to disk_images/crawos.img
index 4044973..1fcadb4
Binary files a/disk_images/crawos.flp and b/disk_images/crawos.img differ
diff --git a/disk_images/crawos.iso b/disk_images/crawos.iso
deleted file mode 100644
index 1133aac..0000000
Binary files a/disk_images/crawos.iso and /dev/null differ
diff --git a/disk_images/kernel.bin b/disk_images/kernel.bin
new file mode 100644
index 0000000..c0fc505
Binary files /dev/null and b/disk_images/kernel.bin differ
diff --git a/source/bootload/.bootload.asm.swp b/source/bootload/.bootload.asm.swp
deleted file mode 100755
index 1f121f0..0000000
Binary files a/source/bootload/.bootload.asm.swp and /dev/null differ
diff --git a/source/bootload/.hexdump.swp b/source/bootload/.hexdump.swp
deleted file mode 100755
index 12fb9ee..0000000
Binary files a/source/bootload/.hexdump.swp and /dev/null differ
diff --git a/source/bootload/.swp b/source/bootload/.swp
deleted file mode 100755
index fb02fca..0000000
Binary files a/source/bootload/.swp and /dev/null differ
diff --git a/source/bootload/boot.asm b/source/bootload/boot.asm
new file mode 100644
index 0000000..9922752
--- /dev/null
+++ b/source/bootload/boot.asm
@@ -0,0 +1,297 @@
+ORG 7C00h
+BITS 16
+
+jmp short main
+nop
+
+; Define Fat12 header
+bdb_oem: db 'MSWIN4.1'
+bdb_bytes_per_sector: dw 512
+bdb_sectors_per_cluster: db 1
+bdb_reserved_sectors: dw 1
+bdb_fat_count: db 2
+bdb_dir_entries_count: dw 0E0h
+bdb_total_sectors: dw 2880
+bdb_media_descriptor_type: db 0F0h
+bdb_sectors_per_fat: dw 9
+bdb_sectors_per_track: dw 18
+bdb_heads: dw 2
+bdb_hidden_sectors: dd 0
+bdb_large_sector_count: dd 0
+
+; extended boot record
+ebr_drive_number: db 0
+ db 0
+ebr_signature: db 29h
+ebr_volume_id: db 12h, 34h, 56h, 78h
+ebr_volume_label: db 'CrawShaw OS'
+ebr_system_id: db 'FAT12 '
+
+main:
+ ; Setup registers
+ mov ax, 0
+ mov ds, ax ; ds = data segment pointer
+ mov es, ax ; es = extra segment pointer
+ mov ss, ax ; ss = stack pointer
+
+ mov sp, 7C00h
+
+ ; Read from disk
+ ;mov [ebr_drive_number], dl
+ ;mov ax, 1
+ ;mov cl, 1
+ ;mov bx, 7E00h
+ ;call disk_read
+
+ ; Output boot text
+ mov si, boot_text
+ call print_string
+
+ ; Load kernel
+ ; 4 segments:
+ ; reserved segment (bdb_reserved_segments, 1)
+ ; FAT: (sectors_per_fat * fat_count) 9*2=18
+ ; root dir: gives location of data
+ ; data: stores the actual data
+
+ ; Get LBA of root dir
+ mov ax, [bdb_sectors_per_fat]
+ mov bl, [bdb_fat_count]
+ xor bh,bh ; clear bh
+ mul bx ; 9 * 2 = 18
+ add ax, [bdb_reserved_sectors] ; The LBA of root dir
+ push ax ; Push to stack
+
+ mov ax, [bdb_dir_entries_count]
+ shl ax,5 ; ax *= 32 (shifting 5 times)
+ xor dx,dx ; Clear dx
+ div word [bdb_bytes_per_sector] ;32*num of entries)/bytes per sector
+ test dx,dx ; See if there's a remainder
+ jz root_dir_after
+ inc ax ; Add one if there's a remainder
+
+root_dir_after:
+ mov cl, al
+ pop ax ; LBA of root dir
+ mov dl, [ebr_drive_number]
+ mov bx, buffer
+ call disk_read
+
+ xor bx,bx ; clear bx
+ mov di, buffer ; Loaded root dir into memory
+
+search_for_kernel:
+ mov si, file_kernel_bin ; Move the name of the kernel into si
+ mov cx, 11
+ push di ; Preserve di
+ repe cmpsb ; Repeat a comparison of bytes between kernel name and current bytes until it finds a match
+ pop di ; Retrieve di
+ je found_kernel
+
+ add di, 32 ; Next directory entry
+ inc bx
+ cmp bx, [bdb_dir_entries_count] ; Have we reached the number of directories that exist
+ jl search_for_kernel ; Repeat search
+
+ jmp kernel_not_found ; If the last dir has been searched, then there is no kernel
+kernel_not_found:
+ mov si, kernel_load_error
+ call print_string
+
+ hlt
+ jmp halt
+
+found_kernel:
+ mov si, kernel_found_text
+ call print_string
+ ; Find kernel cluster
+ mov ax, [di+26]
+ mov [kernel_cluster], ax
+
+ mov ax, [bdb_reserved_sectors]
+ mov bx, buffer
+ mov cl, [bdb_sectors_per_fat]
+ mov dl, [ebr_drive_number]
+
+ call disk_read ; Load FAT from disk into memory
+
+ ; Load kernel into memory
+ mov bx, kernel_load_segment
+ mov es, bx
+ mov bx, kernel_load_offset ; Setup memory that kernel will be loaded into
+
+load_kernel_loop:
+ mov ax, [kernel_cluster]
+ add ax, 31 ; Setup offset so we can read the particular cluster
+ mov cl, 1 ;sectors to read
+ mov dl, [ebr_drive_number]
+
+ call disk_read
+
+ add bx, [bdb_bytes_per_sector]
+
+ ; (kernel_cluster * 3) / 2
+ mov ax, [kernel_cluster]
+ mov cx, 3
+ mul cx
+ mov cx, 2
+ div cx
+
+ ; setup buffers
+ mov si, buffer
+ add si, ax
+ mov ax, [ds:si]
+
+ or dx,dx
+ jz even
+
+odd:
+ shr ax, 4 ;shift ax 4
+ jmp next_cluster_after
+
+even:
+ and ax, 0fffh ; Gives the other 12 bits
+
+next_cluster_after:
+ cmp ax, 0ff8h ; If the value is ff8h or bigger then we've reached the end of FAT
+ jae read_finish
+
+ mov [kernel_cluster], ax
+ jmp load_kernel_loop
+
+read_finish: ; Load kernel
+ mov dl, [ebr_drive_number]
+ mov ax, kernel_load_segment
+ mov ds, ax
+ mov es, ax
+
+ jmp kernel_load_segment:kernel_load_offset ; Jump to the kernel code
+ hlt
+
+
+halt:
+ jmp halt
+
+; LBA = index of data segment on disk
+; CHS = cylinder, header, sector
+; input, LBA index: ax
+; sector number: cx [0-5]
+; cylinder: cx [6-15]
+; head: dh
+lba_to_chs:
+ push ax
+ push dx
+
+ xor dx,dx ; clear dx
+ div word [bdb_sectors_per_track] ;(LBA % sectors per track) + 1 = sector
+ inc dx ; sector, dx stores the remainder so we increment that.
+ mov cx,dx
+
+ xor dx,dx ; clear dx
+ div word [bdb_heads]
+
+ mov dh,dl ; head
+ mov ch,al
+ shl ah, 6
+ or CL, AH ; cylinder
+
+ pop ax
+ mov dl,al
+ pop ax
+
+ RET
+
+disk_read:
+ push ax
+ push bx
+ push cx
+ push dx
+ push di
+
+
+ call lba_to_chs
+
+ mov ah, 02h
+
+ ; repeat drive read 3 times (incase of random error)
+ mov di, 3 ; counter
+
+retry:
+ stc
+ int 13h
+ jnc done_read
+
+ call disk_reset ; Reset drivers of disk
+
+ dec di
+ test di, di
+ jnz retry
+
+fail_disk_read:
+ mov si, disk_read_fail
+ call print_string
+ hlt
+ jmp halt
+
+disk_reset:
+ pusha
+ mov ah, 0 ; Reset drive
+ stc
+ int 13h
+ jc fail_disk_read
+ popa
+ ret
+
+done_read:
+ pop di
+ pop dx
+ pop cx
+ pop bx
+ pop ax
+ ret
+
+; SI = pointer to start of string to be printed
+print_string:
+ push si
+ push ax
+ push bx
+
+ mov ah, 0Eh ; int 10h teletype function, we're telling the BIOS we will print something
+
+ .repeat:
+ lodsb ; Get char from si into al
+ cmp al, 0 ; Compare al to 0
+ je .done ; If char is zero, end of string
+
+ mov bh, 0
+ int 10h ; Otherwise, print it
+ jmp .repeat ; And move on to next char
+
+ .done:
+ ; Print newline
+ mov ah, 0Eh
+ mov al, 13
+ int 10h
+ mov al, 10
+ int 10h
+ ; Exit function
+ pop bx
+ pop ax
+ pop si
+ ret
+
+boot_text: db '[OK] Boot sequence begun...', 0
+kernel_found_text: db '[OK] Kernel located...', 0
+disk_read_fail: db '[ERR] Failed to read disk!', 0
+file_kernel_bin: db 'KERNEL BIN' ; Must have a double space between KERNEL and BIN
+kernel_load_error: db '[ERR] Kernel not found!', 0
+
+kernel_cluster: dw 0
+kernel_load_segment: equ 2000h
+kernel_load_offset: equ 0
+
+
+times 510-($-$$) db 0 ; Fill up the next 510 bits with 0's
+dw 0AA55h ; D
+
+buffer:
diff --git a/source/bootload/bootload.asm b/source/bootload/bootload.asm
deleted file mode 100755
index 5515932..0000000
--- a/source/bootload/bootload.asm
+++ /dev/null
@@ -1,357 +0,0 @@
-; ==================================================================
-; The Mike Operating System bootloader
-; Copyright (C) 2006 - 2022 MikeOS Developers -- see doc/LICENSE.TXT
-;
-; Based on a free boot loader by E Dehling. It scans the FAT12
-; floppy for KERNEL.BIN (the MikeOS kernel), loads it and executes it.
-; This must grow no larger than 512 bytes (one sector), with the final
-; two bytes being the boot signature (AA55h). Note that in FAT12,
-; a cluster is the same as a sector: 512 bytes.
-; ==================================================================
-
-
- BITS 16
-
- jmp short bootloader_start ; Jump past disk description section
- nop ; Pad out before disk description
-
-
-; ------------------------------------------------------------------
-; Disk description table, to make it a valid floppy
-; Note: some of these values are hard-coded in the source!
-; Values are those used by IBM for 1.44 MB, 3.5" diskette
-
-OEMLabel db "MIKEBOOT" ; Disk label
-BytesPerSector dw 512 ; Bytes per sector
-SectorsPerCluster db 1 ; Sectors per cluster
-ReservedForBoot dw 1 ; Reserved sectors for boot record
-NumberOfFats db 2 ; Number of copies of the FAT
-RootDirEntries dw 224 ; Number of entries in root dir
- ; (224 * 32 = 7168 = 14 sectors to read)
-LogicalSectors dw 2880 ; Number of logical sectors
-MediumByte db 0F0h ; Medium descriptor byte
-SectorsPerFat dw 9 ; Sectors per FAT
-SectorsPerTrack dw 18 ; Sectors per track (36/cylinder)
-Sides dw 2 ; Number of sides/heads
-HiddenSectors dd 0 ; Number of hidden sectors
-LargeSectors dd 0 ; Number of LBA sectors
-DriveNo dw 0 ; Drive No: 0
-Signature db 41 ; Drive signature: 41 for floppy
-VolumeID dd 00000000h ; Volume ID: any number
-VolumeLabel db "MIKEOS "; Volume Label: any 11 chars
-FileSystem db "FAT12 " ; File system type: don't change!
-
-
-; ------------------------------------------------------------------
-; Main bootloader code
-
-bootloader_start:
- mov ax, 07C0h ; Set up 4K of stack space above buffer
- add ax, 544 ; 8k buffer = 512 paragraphs + 32 paragraphs (loader)
- cli ; Disable interrupts while changing stack
- mov ss, ax
- mov sp, 4096
- sti ; Restore interrupts
-
- mov ax, 07C0h ; Set data segment to where we're loaded
- mov ds, ax
-
- ; NOTE: A few early BIOSes are reported to improperly set DL
-
- cmp dl, 0
- je no_change
- mov [bootdev], dl ; Save boot device number
- mov ah, 8 ; Get drive parameters
- int 13h
- jc fatal_disk_error
- and cx, 3Fh ; Maximum sector number
- mov [SectorsPerTrack], cx ; Sector numbers start at 1
- movzx dx, dh ; Maximum head number
- add dx, 1 ; Head numbers start at 0 - add 1 for total
- mov [Sides], dx
-
-no_change:
- mov eax, 0 ; Needed for some older BIOSes
-
-
-; First, we need to load the root directory from the disk. Technical details:
-; Start of root = ReservedForBoot + NumberOfFats * SectorsPerFat = logical 19
-; Number of root = RootDirEntries * 32 bytes/entry / 512 bytes/sector = 14
-; Start of user data = (start of root) + (number of root) = logical 33
-
-floppy_ok: ; Ready to read first block of data
- mov ax, 19 ; Root dir starts at logical sector 19
- call l2hts
-
- mov si, buffer ; Set ES:BX to point to our buffer (see end of code)
- mov bx, ds
- mov es, bx
- mov bx, si
-
- mov ah, 2 ; Params for int 13h: read floppy sectors
- mov al, 14 ; And read 14 of them
-
- pusha ; Prepare to enter loop
-
-
-read_root_dir:
- popa ; In case registers are altered by int 13h
- pusha
-
- stc ; A few BIOSes do not set properly on error
- int 13h ; Read sectors using BIOS
-
- jnc search_dir ; If read went OK, skip ahead
- call reset_floppy ; Otherwise, reset floppy controller and try again
- jnc read_root_dir ; Floppy reset OK?
-
- jmp reboot ; If not, fatal double error
-
-
-search_dir:
- popa
-
- mov ax, ds ; Root dir is now in [buffer]
- mov es, ax ; Set DI to this info
- mov di, buffer
-
- mov cx, word [RootDirEntries] ; Search all (224) entries
- mov ax, 0 ; Searching at offset 0
-
-
-next_root_entry:
- xchg cx, dx ; We use CX in the inner loop...
-
- mov si, kern_filename ; Start searching for kernel filename
- mov cx, 11
- rep cmpsb
- je found_file_to_load ; Pointer DI will be at offset 11
-
- add ax, 32 ; Bump searched entries by 1 (32 bytes per entry)
-
- mov di, buffer ; Point to next entry
- add di, ax
-
- xchg dx, cx ; Get the original CX back
- loop next_root_entry
-
- mov si, file_not_found ; If kernel is not found, bail out
- call print_string
- jmp reboot
-
-
-found_file_to_load: ; Fetch cluster and load FAT into RAM
- mov ax, word [es:di+0Fh] ; Offset 11 + 15 = 26, contains 1st cluster
- mov word [cluster], ax
-
- mov ax, 1 ; Sector 1 = first sector of first FAT
- call l2hts
-
- mov di, buffer ; ES:BX points to our buffer
- mov bx, di
-
- mov ah, 2 ; int 13h params: read (FAT) sectors
- mov al, 9 ; All 9 sectors of 1st FAT
-
- pusha ; Prepare to enter loop
-
-
-read_fat:
- popa ; In case registers are altered by int 13h
- pusha
-
- stc
- int 13h ; Read sectors using the BIOS
-
- jnc read_fat_ok ; If read went OK, skip ahead
- call reset_floppy ; Otherwise, reset floppy controller and try again
- jnc read_fat ; Floppy reset OK?
-
-; ******************************************************************
-fatal_disk_error:
-; ******************************************************************
- mov si, disk_error ; If not, print error message and reboot
- call print_string
- jmp reboot ; Fatal double error
-
-
-read_fat_ok:
- popa
-
- mov ax, 2000h ; Segment where we'll load the kernel
- mov es, ax
- mov bx, 0
-
- mov ah, 2 ; int 13h floppy read params
- mov al, 1
-
- push ax ; Save in case we (or int calls) lose it
-
-
-; Now we must load the FAT from the disk. Here's how we find out where it starts:
-; FAT cluster 0 = media descriptor = 0F0h
-; FAT cluster 1 = filler cluster = 0FFh
-; Cluster start = ((cluster number) - 2) * SectorsPerCluster + (start of user)
-; = (cluster number) + 31
-
-load_file_sector:
- mov ax, word [cluster] ; Convert sector to logical
- add ax, 31
-
- call l2hts ; Make appropriate params for int 13h
-
- mov ax, 2000h ; Set buffer past what we've already read
- mov es, ax
- mov bx, word [pointer]
-
- pop ax ; Save in case we (or int calls) lose it
- push ax
-
- stc
- int 13h
-
- jnc calculate_next_cluster ; If there's no error...
-
- call reset_floppy ; Otherwise, reset floppy and retry
- jmp load_file_sector
-
-
- ; In the FAT, cluster values are stored in 12 bits, so we have to
- ; do a bit of maths to work out whether we're dealing with a byte
- ; and 4 bits of the next byte -- or the last 4 bits of one byte
- ; and then the subsequent byte!
-
-calculate_next_cluster:
- mov ax, [cluster]
- mov dx, 0
- mov bx, 3
- mul bx
- mov bx, 2
- div bx ; DX = [cluster] mod 2
- mov si, buffer
- add si, ax ; AX = word in FAT for the 12 bit entry
- mov ax, word [ds:si]
-
- or dx, dx ; If DX = 0 [cluster] is even; if DX = 1 then it's odd
-
- jz even ; If [cluster] is even, drop last 4 bits of word
- ; with next cluster; if odd, drop first 4 bits
-
-odd:
- shr ax, 4 ; Shift out first 4 bits (they belong to another entry)
- jmp short next_cluster_cont
-
-
-even:
- and ax, 0FFFh ; Mask out final 4 bits
-
-
-next_cluster_cont:
- mov word [cluster], ax ; Store cluster
-
- cmp ax, 0FF8h ; FF8h = end of file marker in FAT12
- jae end
-
- add word [pointer], 512 ; Increase buffer pointer 1 sector length
- jmp load_file_sector
-
-
-end: ; We've got the file to load!
- pop ax ; Clean up the stack (AX was pushed earlier)
- mov dl, byte [bootdev] ; Provide kernel with boot device info
-
- jmp 2000h:0000h ; Jump to entry point of loaded kernel!
-
-
-; ------------------------------------------------------------------
-; BOOTLOADER SUBROUTINES
-
-reboot:
- mov ax, 0
- int 16h ; Wait for keystroke
- mov ax, 0
- int 19h ; Reboot the system
-
-
-print_string: ; Output string in SI to screen
- pusha
-
- mov ah, 0Eh ; int 10h teletype function
-
-.repeat:
- lodsb ; Get char from string
- cmp al, 0
- je .done ; If char is zero, end of string
- int 10h ; Otherwise, print it
- jmp short .repeat
-
-.done:
- popa
- ret
-
-
-reset_floppy: ; IN: [bootdev] = boot device; OUT: carry set on error
- push ax
- push dx
- mov ax, 0
- mov dl, byte [bootdev]
- stc
- int 13h
- pop dx
- pop ax
- ret
-
-
-l2hts: ; Calculate head, track and sector settings for int 13h
- ; IN: logical sector in AX, OUT: correct registers for int 13h
- push bx
- push ax
-
- mov bx, ax ; Save logical sector
-
- mov dx, 0 ; First the sector
- div word [SectorsPerTrack]
- add dl, 01h ; Physical sectors start at 1
- mov cl, dl ; Sectors belong in CL for int 13h
- mov ax, bx
-
- mov dx, 0 ; Now calculate the head
- div word [SectorsPerTrack]
- mov dx, 0
- div word [Sides]
- mov dh, dl ; Head/side
- mov ch, al ; Track
-
- pop ax
- pop bx
-
- mov dl, byte [bootdev] ; Set correct device
-
- ret
-
-
-; ------------------------------------------------------------------
-; STRINGS AND VARIABLES
-
- kern_filename db "KERNEL BIN" ; MikeOS kernel filename
-
- disk_error db "Floppy error! Press any key...", 0
- file_not_found db "KERNEL.BIN not found!", 0
-
- bootdev db 0 ; Boot device number
- cluster dw 0 ; Cluster of the file we want to load
- pointer dw 0 ; Pointer into Buffer, for loading kernel
-
-
-; ------------------------------------------------------------------
-; END OF BOOT SECTOR AND BUFFER START
-
- times 510-($-$$) db 0 ; Pad remainder of boot sector with zeros
- dw 0AA55h ; Boot signature (DO NOT CHANGE!)
-
-
-buffer: ; Disk buffer begins (8k after this, stack starts)
-
-
-; ==================================================================
-
diff --git a/source/bootload/bootload.bin b/source/bootload/bootload.bin
deleted file mode 100755
index 68580c7..0000000
Binary files a/source/bootload/bootload.bin and /dev/null differ
diff --git a/source/games/pong_old.asm b/source/games/pong_old.asm
deleted file mode 100644
index ec82717..0000000
--- a/source/games/pong_old.asm
+++ /dev/null
@@ -1,86 +0,0 @@
-game_pong:
- pusha
- call os_set_graphics_mode
- jmp .draw_player_1
- jmp .draw_player_2
- jmp .detect_inputi
-.draw_player_1:
- ; X coords
- mov ax, [p1_x]
- mov [x_start], ax
- mov [x_end], ax
-
- ; Y coords
- mov bx, [p1_y]
- mov [y_start], bx
- add bx, [bat_height] ; Add the bat height to the y coord
- mov [y_end], b
- call os_draw_graphical_rectangle
- ret
-.draw_player_2:
- ; X coords
- mov ax, [p2_x]
- mov [x_start], ax
- mov [x_end], ax
-
- ; Y coords
- mov bx, [p2_y]
- mov [y_start], bx
- add bx, [bat_height] ; Add the bat height to the y coord
- mov [y_end], bx
-
- call os_draw_graphical_rectangle
- ret
-.detect_input:
- call os_read_input
- ; Exit if backspace is pressed
- cmp al, 08h
- je .finish
- ; Go up when you press 'w'
- cmp al, 77h
- je .p1_up
- ; Go up when you press 's'
- cmp al, 73h
- je .p1_down
-
- ; Loop back
- jmp .detect_input
-.p1_down:
- ; X coords
- mov ax, [p1_x]
- mov [x_start], ax
- mov [x_end], ax
-
- ; Y coords
- mov bx, [p1_y]
- add bx, 5 ; Move the bat down 5
- mov [y_start], bx
- add bx, [bat_height] ; Add the bat height to the y coord
- mov [y_end], bx
-
- call os_draw_graphical_rectangle
- ret
-.p1_up:
- mov ax, [move_distance]
- sub ax, [p1_y]
- call os_draw_graphical_rectangle
- ret
-.finish:
- call os_set_text_mode
- popa
- ret
-
-section .data
- x_start dw 0
- y_start dw 0
- x_end dw 0
- y_end dw 0
-
- p1_y dw 5
- p2_y dw 0
- p1_x dw 5
- p2_x dw 30
-
- bat_height dw 20
- move_distance dw 5
- colour db 1111b
diff --git a/source/kernel.asm b/source/kernel.asm
deleted file mode 100755
index 912ca67..0000000
--- a/source/kernel.asm
+++ /dev/null
@@ -1,79 +0,0 @@
- BITS 16
- CPU 386 ; pusha offsets depends on a 386 or better
- ; FS and GS require a 386 or better
-
- %DEFINE CRAWOS_VER '0.0.2' ; OS version number
- %DEFINE CRAWOS_API_VER 1 ; API version for programs to check
-
-
- ; This is the location in RAM for kernel disk operations, 24K
- ; after the point where the kernel has loaded; it's 8K in size,
- ; because external programs load after it at the 32K point:
-
- disk_buffer equ 24576
-
-
-
-; ------------------------------------------------------------------
-; START OF MAIN KERNEL CODE
-
-os_main:
- cli ; Clear interrupts
- mov ax, 0
- mov ss, ax ; Set stack segment and pointer
- mov sp, 0FFFFh
- sti ; Restore interrupts
-
- cld ; The default direction for string operations
- ; will be 'up' - incrementing address in RAM
-
- mov ax, 2000h ; Set all segments to match where kernel is loaded
- mov ds, ax ; After this, we don't need to bother with
- mov es, ax ; segments ever again, as MikeOS and its programs
- mov fs, ax ; live entirely in 64K
- mov gs, ax
-
- cmp dl, 0
- je no_change
-
-no_change:
- mov si, help_text
- call os_print_string_nl
- call os_start_cli
-
-bootdev db 0
-SecsPerTrack dw 18
-Sides dw 2
-
-; ------------------------------------------------------------------
-; SYSTEM VARIABLES -- Settings for programs and system calls
-
-
- ; Time and date formatting
-
- fmt_12_24 db 0 ; Non-zero = 24-hr format
-
- fmt_date db 0, '/' ; 0, 1, 2 = M/D/Y, D/M/Y or Y/M/D
- ; Bit 7 = use name for months
- ; If bit 7 = 0, second byte = separator character
-
-
-; ------------------------------------------------------------------
-; FEATURES -- Code to pull into the kernel
- %INCLUDE "features/screen.asm"
- %INCLUDE "features/cli.asm"
- %INCLUDE "features/power.asm"
- %INCLUDE "features/strings.asm"
- %INCLUDE "features/graphics.asm"
- %INCLUDE "features/sound.asm"
-
-; FUNCTIONS -- Other stuff that is useful
- %INCLUDE "functios/math.asm"
-
-; GAMES -- Games that I wrote for it
- %INCLUDE "games/pong.asm"
-
-; ==================================================================
-; END OF KERNEL
-; ==================================================================
-
diff --git a/source/kernel.bin b/source/kernel.bin
deleted file mode 100644
index c3efb35..0000000
Binary files a/source/kernel.bin and /dev/null differ
diff --git a/source/features/sound.asm b/source/kernel/features/basic.asm
similarity index 100%
rename from source/features/sound.asm
rename to source/kernel/features/basic.asm
diff --git a/source/features/cli.asm b/source/kernel/features/cli.asm
similarity index 74%
rename from source/features/cli.asm
rename to source/kernel/features/cli.asm
index ecb1fc4..0dcce7e 100755
--- a/source/features/cli.asm
+++ b/source/kernel/features/cli.asm
@@ -40,6 +40,12 @@ os_read_cli:
cmp cl, 1
je pong
+ mov si, user_input
+ mov di, snake_string
+ call os_compare_strings
+ cmp cl, 1
+ je snake
+
jmp .unkown
.unkown:
@@ -66,13 +72,19 @@ pong:
call game_pong
call os_read_cli.finish
+snake:
+ call game_snake
+ call os_read_cli.finish
+
section .data
+ welcome_text db 'Welcome to CrawOS, the Cool, Real and AWsome Operating System', 0
user_input times 20 db 0
prompt_length db 20
- prompt db 'CrawOS: ', 0
+ prompt db 'CrawOS sh> ', 0
help_string db 'HELP', 0
clear_string db 'CLEAR', 0
pong_string db 'PONG', 0
- help_text db 'This is CrawOS, type "HELP" for help, "CLEAR" to clear the screen', 0
+ snake_string db 'SNAKE', 0
+ help_text db 'This is for Cowards: "HELP" for this help text, "CLEAR" to clear the screen, esc to reboot', 0
command_result_text db 'You typed: ', 0
unknown_command db 'Error: Unkown Command.. ', 0
diff --git a/source/functions/math.asm b/source/kernel/features/disk.asm
similarity index 100%
rename from source/functions/math.asm
rename to source/kernel/features/disk.asm
diff --git a/source/features/graphics.asm b/source/kernel/features/graphics.asm
similarity index 100%
rename from source/features/graphics.asm
rename to source/kernel/features/graphics.asm
diff --git a/source/kernel/features/keyboard.asm b/source/kernel/features/keyboard.asm
new file mode 100644
index 0000000..17dd3c8
--- /dev/null
+++ b/source/kernel/features/keyboard.asm
@@ -0,0 +1,77 @@
+; AX = key pressed
+os_read_input:
+ mov ah, 11h ; BIOS call to check for key
+ int 16h ; Interrupt
+ jnz .key_pressed ; Jump if input isn't 0
+
+ hlt
+ jmp os_read_input
+
+.key_pressed:
+ mov ah, 10h
+ int 16h
+ ret
+
+; -------------------------------------------
+
+os_display_input:
+ pusha
+ mov cx, [prompt_length]
+
+.loop:
+ call .check_key_pressed
+
+ jmp .loop
+
+.check_key_pressed:
+ call os_read_input
+
+ cmp al, 08h
+ je .backspace
+
+ cmp al, 0Dh
+ je .enter_key
+
+ cmp al, 1Bh
+ je .esc_key
+
+ cmp cx, 0
+ jb .check_key_pressed
+
+ call .print_current_input
+ dec cx
+ jmp .check_key_pressed
+
+.esc_key:
+ call os_reboot
+
+.enter_key:
+ mov al, 0
+ stosb
+ popa
+ call os_read_cli
+
+.backspace:
+ call .move_cursor_back ; then .move_cursor_back
+ call .loop ; Else .loop
+
+.move_cursor_back:
+ mov ah, 0Eh
+
+ mov al, 08h
+ int 10h
+ mov al, 20h
+ int 10h
+ mov al, 08h
+ int 10h
+
+ dec di
+ jmp os_display_input
+
+.print_current_input:
+ stosb
+
+ mov ah, 0Eh
+ int 10h
+
+ ret
diff --git a/source/kernel/features/math.asm b/source/kernel/features/math.asm
new file mode 100644
index 0000000..e69de29
diff --git a/source/features/power.asm b/source/kernel/features/power.asm
similarity index 100%
rename from source/features/power.asm
rename to source/kernel/features/power.asm
diff --git a/source/kernel/features/sound.asm b/source/kernel/features/sound.asm
new file mode 100644
index 0000000..e69de29
diff --git a/source/features/strings.asm b/source/kernel/features/strings.asm
similarity index 100%
rename from source/features/strings.asm
rename to source/kernel/features/strings.asm
diff --git a/source/features/screen.asm b/source/kernel/features/text.asm
similarity index 52%
rename from source/features/screen.asm
rename to source/kernel/features/text.asm
index 894e367..584b16b 100755
--- a/source/features/screen.asm
+++ b/source/kernel/features/text.asm
@@ -68,82 +68,3 @@ os_set_text_mode:
popa
ret
-; -------------------------------------------
-
-; AX = key pressed
-os_read_input:
- mov ah, 11h ; BIOS call to check for key
- int 16h ; Interrupt
- jnz .key_pressed ; Jump if input isn't 0
-
- hlt
- jmp os_read_input
-
-.key_pressed:
- mov ah, 10h
- int 16h
- ret
-
-; -------------------------------------------
-
-os_display_input:
- pusha
- mov cx, [prompt_length]
-
-.loop:
- call .check_key_pressed
-
- jmp .loop
-
-.check_key_pressed:
- call os_read_input
-
- cmp al, 08h
- je .backspace
-
- cmp al, 0Dh
- je .enter_key
-
- cmp al, 1Bh
- je .esc_key
-
- cmp cx, 0
- jb .check_key_pressed
-
- call .print_current_input
- dec cx
- jmp .check_key_pressed
-
-.esc_key:
- call os_reboot
-
-.enter_key:
- mov al, 0
- stosb
- popa
- call os_read_cli
-
-.backspace:
- call .move_cursor_back ; then .move_cursor_back
- call .loop ; Else .loop
-
-.move_cursor_back:
- mov ah, 0Eh
-
- mov al, 08h
- int 10h
- mov al, 20h
- int 10h
- mov al, 08h
- int 10h
-
- dec di
- jmp os_display_input
-
-.print_current_input:
- stosb
-
- mov ah, 0Eh
- int 10h
-
- ret
diff --git a/source/games/pong.asm b/source/kernel/games/pong.asm
similarity index 64%
rename from source/games/pong.asm
rename to source/kernel/games/pong.asm
index 852340e..71745a3 100644
--- a/source/games/pong.asm
+++ b/source/kernel/games/pong.asm
@@ -1,5 +1,5 @@
game_pong:
- call .draw_players
+ call .draw_screen
call .detect_input
; Clears screen and draws both players and ball
@@ -29,6 +29,18 @@ game_pong:
mov [y_end], bx
call os_draw_graphical_rectangle ; Draw player 1
+.draw_ball:
+ ; The ball
+ mov ax, [ball_x]
+ mov [x_start], ax
+ mov [x_end], ax
+
+ mov bx, [ball_y]
+ mov [y_start], bx
+ mov [y_end], bx
+
+ call os_draw_graphical_rectangle ; Draw the ball
+
ret
; Player 1 movements
@@ -36,13 +48,11 @@ game_pong:
mov dx, [p1_y]
sub dx, 5
mov [p1_y], dx
- call .draw_players
jmp .detect_input
.p1_down:
mov dx, [p1_y]
add dx, 5
mov [p1_y], dx
- call .draw_players
jmp .detect_input
; Player 2 movements
@@ -50,18 +60,35 @@ game_pong:
mov dx, [p2_y]
sub dx, 5
mov [p2_y], dx
- call .draw_players
jmp .detect_input
.p2_down:
mov dx, [p2_y]
add dx, 5
mov [p2_y], dx
- call .draw_players
jmp .detect_input
; Ball bouncing
+; This should move the ball along one frame
+; The ball moves 1 pixel per frame, however this is usually
+; at an angle, so we need sin and cos
.bounce_ball:
+ ; Change the x coords
+ fld dword [ball_angle]
+ fcos
+ fld dword [precise_ball_x]
+ faddp
+ frndint
+ fstp dword [ball_x]
+ ; Change the y coords
+ fld dword [ball_angle]
+ fsin
+ fld dword [precise_ball_y]
+ faddp
+ frndint
+ fstp dword [ball_y]
+
+ ret
.detect_input:
call os_read_input
@@ -80,6 +107,9 @@ game_pong:
cmp al, 27h ; Pressed ''' (player 2 down)
je .p2_down
+ call .bounce_ball
+ call .draw_screen
+
jmp .detect_input
.finish:
@@ -87,8 +117,13 @@ game_pong:
call os_start_cli
section .data
- ball_x dw 5
- ball_y dw 5
+ ball_x dw 100
+ ball_y dw 100
+ precise_ball_x dw 100
+ precise_ball_y dw 100
+ ball_angle dw 1 ; In radians
+ cos_ball_angle dw 0
+ sin_ball_angle dw 0
p1_x dw 5
p1_y dw 5
diff --git a/source/kernel/games/snake.asm b/source/kernel/games/snake.asm
new file mode 100644
index 0000000..7262772
--- /dev/null
+++ b/source/kernel/games/snake.asm
@@ -0,0 +1,94 @@
+game_snake:
+ call .draw_screen
+ call .detect_input
+
+.draw_screen:
+ call os_set_graphics_mode ; Clear screen
+.draw_snake_loop:
+ mov ax, [snake_x]
+ mov [x_start], ax
+ mov [x_end], ax
+
+ mov bx, [snake_y]
+ mov [y_start], bx
+ mov [y_end], bx
+
+ call os_draw_graphical_rectangle
+ ret
+
+; Player 1 movements
+.up:
+ mov dword [snake_direction], 0
+ jmp .end_detect_input
+.down:
+ mov dword [snake_direction], 2
+ jmp .end_detect_input
+.left:
+ mov dword [snake_direction], 3
+ jmp .end_detect_input
+.right:
+ mov dword [snake_direction], 1
+ jmp .end_detect_input
+
+.move_up:
+ mov dx, [snake_y]
+ sub dx, 1
+ mov [snake_y], dx
+ ret
+.move_down:
+ mov dx, [snake_y]
+ add dx, 1
+ mov [snake_y], dx
+ ret
+.move_left:
+ mov dx, [snake_x]
+ sub dx, 1
+ mov [snake_x], dx
+ ret
+.move_right:
+ mov dx, [snake_x]
+ add dx, 1
+ mov [snake_x], dx
+ ret
+
+.move_snake:
+ cmp dword [snake_direction], 0
+ je .move_up
+ cmp dword [snake_direction], 1
+ je .move_right
+ cmp dword [snake_direction], 2
+ je .move_down
+ ; Else it must be left
+ jmp .move_left
+
+
+.detect_input:
+ call os_read_input
+ cmp al, 08h
+ je .finish
+
+ ; Player 1
+ cmp al, 77h ; Pressed 'w' up
+ je .up
+ cmp al, 61h ; Pressed 'a' left
+ je .left
+ cmp al, 73h ; Pressed 's' down
+ je .down
+ cmp al, 64h ; Pressed 'd' right
+ je .right
+.end_detect_input:
+ call .move_snake
+ call .draw_screen
+
+ jmp .detect_input
+
+.finish:
+ call os_set_text_mode
+ call os_start_cli
+
+
+section .data:
+ snake_x: dw 5
+ snake_y: dw 5
+ snake_direction: dw 1 ; 0=up, 1=right, 2=down, 3=left
+ snake_length: dw 1
diff --git a/source/kernel/kernel.asm b/source/kernel/kernel.asm
new file mode 100644
index 0000000..a3dfd28
--- /dev/null
+++ b/source/kernel/kernel.asm
@@ -0,0 +1,32 @@
+ORG 0h
+BITS 16
+
+start:
+ mov si, boot_message
+ call os_print_string_nl
+
+ mov si, help_text
+ call os_print_string_nl
+
+ call os_start_cli
+ hlt
+
+halt:
+ jmp halt
+
+boot_message: db 0Dh, 'Welcome to CrawOS!', 0Dh, 0
+
+; ------------------------------------------------------------------
+; FEATURES -- Code to pull into the kernel
+ %INCLUDE "source/kernel/features/text.asm"
+ %INCLUDE "source/kernel/features/keyboard.asm"
+ %INCLUDE "source/kernel/features/cli.asm"
+ %INCLUDE "source/kernel/features/power.asm"
+ %INCLUDE "source/kernel/features/strings.asm"
+ %INCLUDE "source/kernel/features/graphics.asm"
+ %INCLUDE "source/kernel/features/sound.asm"
+ %INCLUDE "source/kernel/features/basic.asm"
+ %INCLUDE "source/kernel/features/math.asm"
+; GAMES -- Games that I wrote for it
+ %INCLUDE "source/kernel/games/pong.asm"
+ %INCLUDE "source/kernel/games/snake.asm"