Merge branch 'trunk' of chtm-lapp-02.lan.chtm.me:nivirx/stevia into trunk

fixed a bug where fat32_state wasn't being updated...

.gitignore

@@ -2,8 +2,10 @@ out/*
 build/*
 *.img
 *.img.gz
+*.img.gz
 *.elf
 bx_enh_dbg.ini
 stevia-log
 .vscode/
 *.map
+compose-dev.yaml

COPYING

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  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.
+
+  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.
+
+  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.
+
+  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.
+
+  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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 <https://www.gnu.org/licenses/>.
+
+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:
+
+    <program>  Copyright (C) <year>  <name of author>
+    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
+<https://www.gnu.org/licenses/>.
+
+  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
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

LICENSE.md

@@ -1,19 +1,14 @@
-Copyright (c) 2023 Elaina Claus
+Copyright (C) 2025 Elaina Claus
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+    This program is free software: you can redistribute it and/or modify
-of this software and associated documentation files (the "Software"), to deal
+    it under the terms of the GNU General Public License as published by
-in the Software without restriction, including without limitation the rights
+    the Free Software Foundation, either version 3 of the License, or
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    (at your option) any later version.
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
+    This program is distributed in the hope that it will be useful,
-copies or substantial portions of the Software.
+    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.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    You should have received a copy of the GNU General Public License
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

Makefile

@@ -1,3 +1,18 @@
+# Copyright (C) 2025 Elaina Claus
+# 
+#     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 <https://www.gnu.org/licenses/>.
+
 include := './include'
 
 mbr_source_files := $(wildcard src/mbr/*.nasm)

include/BIOS/BIOS_SYS.inc

@@ -1,22 +1,17 @@
-; Copyright (c) 2024 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 %include 'BIOS/func/a20enable.nasm'
 %include 'BIOS/func/E820_memory_map.nasm'

include/BIOS/func/E820_memory_map.nasm

@@ -1,22 +1,17 @@
-; Copyright (c) 2024 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 %ifndef __INC_E820MEMORY_MAP
 

include/BIOS/func/a20enable.nasm

@@ -1,22 +1,17 @@
-; Copyright (c) 2024 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 %ifndef __INC_A20ENABLE
 ;

include/BIOS/func/ext_read.nasm

@@ -1,22 +1,17 @@
-; Copyright (c) 2024 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 %ifndef __INC_EXT_READ
 ;Offset	Size	    Description
@@ -98,15 +93,20 @@ read_disk_raw:
     mov ax, [bp + 12]
     mov word [bx + LBAPkt_t.xfer_size], ax
 
-    mov eax, [bp + 8]
+    mov eax, dword [bp + 8]
     mov dword [bx + LBAPkt_t.lower_lba], eax
 
+    ; upper_lba is zero from kmemset
+    ; TODO: possiblly support >32bit LBA addresses in the future, this limits us to 4GiB
+
     mov ax, [bp + 6]
     mov word [bx + LBAPkt_t.offset], ax
 
-    movzx ax, byte [bp + 4]
+    mov ax, [bp + 4]
     mov word [bx + LBAPkt_t.segment], ax
 
+    xor ax, ax
+    xor dx, dx
     mov si, bx                  ; ds:si LBAPkt_t
     mov ah, 0x42                ; call #
     mov dl, byte [bp + 14]      ; drive #             

include/BIOS/func/video.nasm

@@ -1,22 +1,17 @@
-; Copyright (c) 2024 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 %ifndef __INC_VIDEO
 ; Sets output to 80x25 16 color text mode via BIOS call

include/cdecl16.inc

@@ -1,22 +1,18 @@
-; Copyright (c) 2024 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 %ifnmacro __CDECL16_ENTRY
 %macro __CDECL16_ENTRY 0
     push bp
@@ -55,3 +51,17 @@
     pop ax
 %endmacro
 %endif
+
+%ifnmacro __FASTCALL16_ENTRY
+%macro __FASTCALL16_ENTRY 0
+    push bp
+    mov bp, sp
+%endmacro
+%endif
+
+%ifnmacro __FASTCALL16_EXIT
+%macro __FASTCALL16_EXIT 0
+    mov sp, bp
+    pop bp
+%endmacro
+%endif

include/config.inc

@@ -1,22 +1,17 @@
-; Copyright (c) 2024 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 %ifndef __INC_STEVIA_CONFIG
 

include/early_mem.inc

@@ -1,22 +1,17 @@
-; Copyright (c) 2024 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 %ifndef __INC_EARLY_MEM
 

include/entry.inc

@@ -1,22 +1,17 @@
-; Copyright (c) 2024 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 %ifndef __INC_ENTRY
 

include/error_codes.inc

@@ -1,22 +1,17 @@
-; Copyright (c) 2024 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 %ifndef __INC_ERROR_CODES
 
@@ -63,7 +58,7 @@
 %define STAGE2_FAT32_NCLUS_CFDIVZ    'K'
 %define STAGE2_FAT32_CLS2LBA_CF      'L'
 %define STAGE2_FAT32_INIT_CF         'M'
-%define STAGE2_ERROR_RESERVED_N      'N'
+%define STAGE2_ERROR_INFOPRINTER     'N'
 %define STAGE2_ERROR_RESERVED_O      'O'
 %define STAGE2_ERROR_RESERVED_P      'P'
 %define STAGE2_ERROR_RESERVED_Q      'Q'

include/fat32/FAT32_SYS.inc

@@ -1,22 +1,17 @@
-; Copyright (c) 2024 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 %ifndef __INC_FAT32_SYS
 
@@ -24,6 +19,8 @@
 %include "fat32/bpb_offset_bx.inc"
 %include "fat32/fat32_structures.inc"
 
+; Clobbers: eax, edx
+; returns: none
 ALIGN 4, db 0x90
 InitFATDriver:
     __CDECL16_ENTRY
@@ -39,42 +36,63 @@ InitFATDriver:
 
 .calc_active_part:
     mov ax, word [partition_offset]            
+    mov di, fat32_state
 
     mov dx, partition_table
     add dx, ax                                                           ; dx points to the partition that was booted from
     mov bx, dx                                                           ; set bx, should point at our partition
 
     mov eax, dword [bx + PartEntry_t.lba_start]
-    mov dword [fat32_state + FAT32_State_t.active_drive_lba_32], eax
+    mov dword [di + FAT32_State_t.curr_drive_lba_32], eax
 
+    mov si, fat32_bpb
+    mov bx, fat32_ebpb
 .calc_first_fat:
-    movzx eax,  word [fat32_bpb + FAT32_bpb_t.reserved_sectors_16]        ; first fat from start of partition
+    movzx eax,  word [si + FAT32_bpb_t.reserved_sectors_word]        ; first fat from start of partition
-    add   eax, dword [fat32_state + FAT32_State_t.active_drive_lba_32]    ; calculate offset from start of drive
+    add   eax, dword [di + FAT32_State_t.curr_drive_lba_32]          ; calculate offset from start of drive
+    jc InitFATDriver.error
 
-    mov dword [fat32_state + FAT32_State_t.first_fat_sector_32], eax
+    mov dword [di + FAT32_State_t.first_fat_sector_32], eax
 .calc_total_fat:
-    mov ebx,  dword [fat32_ebpb + FAT32_ebpb_t.sectors_per_fat_32]
+    mov edx,  dword [bx + FAT32_ebpb_t.FATSz_dword]
-    movzx eax, byte [fat32_bpb + FAT32_bpb_t.fat_count_8]
+    movzx eax, byte [si + FAT32_bpb_t.fat_count_byte]
-    mul ebx                                                                ; result in EDX:EAX, CF set on > 32bit return value
+    mul edx                                                                ; result in EDX:EAX, CF set on > 32bit return value
     jc InitFATDriver.error                                                 ; as a catch for unhandled overflow, just error if value is greater than 32bits
 
-    mov dword [fat32_state + FAT32_State_t.fat_size_32], eax
+    mov dword [di + FAT32_State_t.fat_size_32], eax
 .calc_first_data:
-    mov edx, dword [fat32_state + FAT32_State_t.first_fat_sector_32]
+    mov edx, dword [di + FAT32_State_t.first_fat_sector_32]
     add eax, edx
+    jc InitFATDriver.error
 
-    mov dword [fat32_state + FAT32_State_t.first_data_sector_32], eax
+    mov dword [di + FAT32_State_t.first_data_sector_32], eax
-.get_first_root_dir:
+.set_first_dir:
-    mov eax, [fat32_ebpb + FAT32_ebpb_t.root_dir_cluster_32]
+    mov eax, dword [bx + FAT32_ebpb_t.root_clus_dword]
-    mov dword [fat32_state + FAT32_State_t.first_root_dir_sector_32], eax   ; this only works when 1 cluster = 1 sector
+    mov dword [di + FAT32_State_t.curr_dir_cluster_32], eax
-    mov dword [fat32_state + FAT32_State_t.active_dir_cluster_32], eax
-
 .endp:
     __CDECL16_EXIT
     ret
 .error:
     ERROR STAGE2_FAT32_INIT_CF
 
+ALIGN 4, db 0x90
+FSInfoPrinter:
+    __CDECL16_ENTRY
+.func:
+    ;info we want to print to validate we are loading stuff from the disk correctly
+    ; boot_drive # (i.e 0x80)
+    ; active/bootable partition info (lba_start, lba_length, part_type)
+    ; BPB Info: BS_OEMName = ident_8, BPB_BytsPerSec = bytes_per_sector_16, BPB_SecPerClus = sectors_per_cluster_8
+    ; eBPB info: FATSz_dword, volid, vol label
+    ; 
+    ; print entire FAT32 state
+    ;
+.endp:
+    __CDECL16_EXIT
+    ret
+.error:
+    ERROR STAGE2_ERROR_INFOPRINTER
+
 ; this involves using the low memory buffer for the bios call and moving the file sector by sector to high memory
 ;
 ; SFN is a 8.3 file name, all uppercase, and padded with spaces
@@ -88,10 +106,10 @@ ALIGN 4, db 0x90
 SearchFATDIR:
     __CDECL16_ENTRY
 .file_lookup:
-    print_string SearchFATDIR_INFO_cstr
+    print_string SearchFATDIR_info
-
+    mov bx, fat32_state
     .load_first_dir:
-        mov eax, dword [fat32_state + FAT32_State_t.active_dir_cluster_32]
+        mov eax, dword [bx + FAT32_State_t.curr_dir_cluster_32]
         push dword eax          ; cluster
         mov ax, dir_buffer
         push ax                 ; offset
@@ -107,7 +125,7 @@ SearchFATDIR:
         ; if eax >= 0x0FFFFFF8 then there are no more clusters (end of chain)
         ; if eax == 0x0FFFFFF7 then this is a cluster that is marked as bad
         
-        mov eax, dword [fat32_state + FAT32_State_t.active_dir_cluster_32]
+        mov eax, dword [bx + FAT32_State_t.curr_dir_cluster_32]
         push dword eax
         call NextCluster        ; uint32_t NextCluster(uint32_t active_cluster);
         add sp, 0x4
@@ -119,7 +137,7 @@ SearchFATDIR:
 
     .load_next_dir_next_OK:
         ; load 512 bytes of directory entries from data sector
-        mov eax, [fat32_state + FAT32_State_t.active_dir_cluster_32]
+        mov eax, [bx + FAT32_State_t.curr_dir_cluster_32]
         push dword eax          ; cluster
 
         mov ax, dir_buffer    
@@ -156,8 +174,9 @@ SearchFATDIR:
         jae SearchFATDIR.load_next_dir
         jmp SearchFATDIR.empty_dir_entry
 
+    ; TODO: move this to a seperate string search function
     .parse_dir:
-        print_string MaybeFound_Boot_INFO_cstr
+        print_string MaybeFound_Boot_info
         .lfn_check:
             ; check for ATTR_READ_ONLY | ATTR_HIDDEN | ATTR_SYSTEM | ATTR_VOLUME_ID  (0x0F) in offset 11
             ; TODO: going to skip LFN for now, since all valid volumes will have SFN's
@@ -169,7 +188,7 @@ SearchFATDIR:
 
             mov cx, 0xA                     ; max of 11 filename length of 11 characters
             ; si points to the start of the current directory entry
-            mov di, BootTarget_str          ; current memory location (8.3 name is at offset 0)
+            mov di, BootTarget              ; current memory location (8.3 name is at offset 0)
             repe cmpsb                      ; compare the strings
 
             pop di
@@ -193,43 +212,39 @@ ALIGN 4, db 0x90
 NextCluster:
     __CDECL16_ENTRY
 .func:
-    print_string NextFATCluster_INFO_cstr
+    print_string NextFATCluster_info
+
+    mov ax, FAT32_NextClusterData_t_size
+    push ax                     ; length
+    xor ax, ax
+    push ax                     ; init with zero
+    mov ax, fat32_nc_data
+    push ax                     ; address of structure
+    call kmemset
+    sub sp, 0x6
+
     mov edx, dword [bp + 4]
     mov si, fat32_nc_data                        ; instead of push/pop and moving the data back
     mov di, fat32_bpb                            ; load si & di then use xchg
+    mov bx, fat32_state
 .calc_offset:
 ; fat_offset = active_cluster * 4
     mov eax, 4
     mul edx                                      
     jc NextCluster.error_cfdivz
     mov dword [si + FAT32_NextClusterData_t.fat_offset], eax        ; move lower 32 bits to fat offset
-
 .calc_fat_sector:
 ; fat_sector = first_fat_sector + (fat_offset / sector_size)
 ; entry_offset = fat_offset % sector_size
-    mov edx, 0xffff_0000
+    xor edx, edx
-    and edx, eax
+    movzx ecx, word [di + FAT32_bpb_t.bytes_per_sector_word]
-    shr edx, 16
+    cmp eax, 0
-
-    xchg si, di         ; switch to fat32_bpb in si
-    mov cx, word [si + FAT32_bpb_t.bytes_per_sector_16]
-    xchg si, di
-
-    cmp edx, 0
     je NextCluster.error_cfdivz
-    div cx              ; DX:AX / cx = fat_sector - first_fat_sector in AX
+    div ecx              ; eDX:eAX / eCX = fat_sector - first_fat_sector in eAX
-                        ; DX = remainder (fat_offset mod sector_size)
+                        ; eDX = remainder (fat_offset mod sector_size)
 
-    mov ecx, 0x0000_ffff
-    and edx, ecx
     mov dword [si + FAT32_NextClusterData_t.entry_offset], edx
-
+    mov ecx, dword [bx + FAT32_State_t.first_fat_sector_32]
-    xchg si, di         ; switch to fat32_bpb in si
-    mov ecx, dword [si + FAT32_State_t.first_fat_sector_32]
-    xchg si, di
-
-    mov edx, 0x0000ffff
-    and eax, edx
     add eax, ecx        ; fat_sector + first_fat_sector
     mov dword [si + FAT32_NextClusterData_t.fat_sector], eax
 .load_fat_table:
@@ -265,31 +280,15 @@ NextCluster:
 .error_cfdivz:
     ERROR STAGE2_FAT32_NCLUS_CFDIVZ
 
-; uint32_t ClusterToLBA(uint32_t cluster)
-ALIGN 4, db 0x90
-ClusterToLBA:
-    __CDECL16_ENTRY
-.func:
-    mov dword eax, [bp + 4]
-    sub eax, 2
-    movzx edx, byte [fat32_bpb + FAT32_bpb_t.sectors_per_cluster_8]
-    mul edx
-    jc ClusterToLBA.error
-    add eax, dword [fat32_state + FAT32_State_t.first_data_sector_32]
-    ; eax contains the LBA now
-.endp:
-    __CDECL16_EXIT
-    ret
-.error:
-    ERROR STAGE2_FAT32_CLS2LBA_CF
-
-; bp - 2 - byte boot_drive
 ; uint8_t ReadFATCluster(uint16_t seg, uint16_t offset, uint32_t cluster)
 ALIGN 4, db 0x90
 ReadFATCluster:
     __CDECL16_ENTRY
 .func:
-    print_string ReadFATCluster_INFO_cstr
+    print_string ReadFATCluster_info
+
+    mov bx, fat32_bpb
+    mov si, fat32_ebpb
 
     xor ax, ax
     mov al, byte [boot_drive]
@@ -298,26 +297,31 @@ ReadFATCluster:
     mov ax, 0x1                         ; count = 1
     push ax
 
-    mov eax, dword [bp + 8]
+    mov eax, dword [bp + 8]             ; cluster
-    push dword eax
+    sub eax, 2
-    call ClusterToLBA
+    movzx edx, byte [bx + FAT32_bpb_t.sectors_per_cluster_byte]
-    add sp, 0x4
+    mul edx                             ; result in eax, error on carry 
+    jc ReadFATCluster.error
+    add eax, dword [si + FAT32_State_t.first_data_sector_32]
+    jc ReadFATCluster.error
     ; eax contains the LBA now
     push dword eax                      ; lba = ClusterToLBA(..)
 
-    mov ax, fat_buffer                  ; offset = fat_buffer (in mem.inc)
+    mov ax, word [bp + 6]               ; offset
     push ax
 
-    xor ax, ax                          ; segment = 0x0000, our buffer is in the first 64 KiB
+    mov ax, word [bp + 4]
     push ax
-; uint8_t read_stage2_raw(uint16_t buf_segment, uint16_t buf_offset, 
+    ; uint8_t read_disk_raw(uint16_t buf_segment, uint16_t buf_offset, 
-;                         uint32_t lba,
+    ;                         uint32_t lba,
-;                         uint16_t count, uint16_t drive_num)
+    ;                         uint16_t count, uint16_t drive_num)
     call read_disk_raw  
     add sp, 0xC
 .endp:
     __CDECL16_EXIT
     ret
+.error:
+    ERROR STAGE2_FAT32_CLS2LBA_CF
 
 %endif
 %define __INC_FAT32_SYS

include/fat32/bpb_offset_bx.inc

@@ -1,22 +1,17 @@
-; Copyright (c) 2024 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 %ifndef __INC_BPD_OFFSET_BX
 

include/fat32/fat32_structures.inc

@@ -1,22 +1,17 @@
-; Copyright (c) 2023 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 %ifndef __INC_FAT32_STRUCT
 
@@ -63,20 +58,20 @@
 ;                           resulting in a value which does not fit in the Number of Sectors entry at 0x13. 
 
 struc FAT32_bpb_t
-    .reserved_init             resb 3
+    .reserved_jmpboot               resb 3
-    .ident_8                   resb 8
+    .ident                          resb 8
-    .bytes_per_sector_16       resb 2
+    .bytes_per_sector_word          resb 2
-    .sectors_per_cluster_8     resb 1
+    .sectors_per_cluster_byte       resb 1
-    .reserved_sectors_16       resb 2
+    .reserved_sectors_word          resb 2
-    .fat_count_8               resb 1
+    .fat_count_byte                 resb 1
-    .dir_entry_count_16        resb 2
+    .unused1_ZERO_word              resb 2      ; Root entry count field, 0 on fat32
-    .sector_count_16           resb 2
+    .unused2_ZERO_word              resb 2      ; total sectors size 16, 0 on fat32
-    .media_desc_8              resb 1
+    .media_desc_byte                resb 1
-    .sectors_per_fat_16        resb 2
+    .unused3_ZERO_word              resb 2      ; FAT size 16, 0 on fat32
-    .sectors_per_track_16      resb 2
+    .sectors_per_track_word         resb 2
-    .head_count_16             resb 2
+    .head_count_word                resb 2
-    .hidden_sectors_32         resb 4
+    .hidden_sectors_dword           resb 4
-    .sector_count_32           resb 4
+    .total_sectors_dword            resb 4
 endstruc
 
 ; EBPB Information (FAT32)
@@ -96,19 +91,19 @@ endstruc
 ;   8 	System identifier string. Always "FAT32   ". The spec says never to trust the contents of this string for any use.
 
 struc FAT32_ebpb_t
-    .sectors_per_fat_32        resb 4
+    .FATSz_dword                resb 4
-    .fat32_flags_16            resb 2
+    .extflags_word              resb 2
-    .fat32_version_16          resb 2
+    .FSVersion_word             resb 2
-    .root_dir_cluster_32       resb 4
+    .root_clus_dword            resb 4
-    .fsinfo_sector_16          resb 2
+    .FSInfo_word                resb 2
-    .backup_boot_sector_16     resb 2
+    .BkBootSec_word             resb 2
     .reserved1                  resb 12
-    .drive_number_8            resb 1
+    .drive_number_byte          resb 1
-    .nt_flags_8                resb 1
+    .nt_flags_byte              resb 1
-    .signature_8               resb 1
+    .signature_byte             resb 1
-    .volume_serial_32          resb 4
+    .volume_id_dword            resb 4
-    .volume_label              resb 11
+    .volume_label_bytea         resb 11
-    .system_ident              resb 8
+    .system_ident_bytea         resb 8
 endstruc
 
 ; ## Standard 8.3 structure ###
@@ -134,19 +129,43 @@ endstruc
 ;   26              2                Low 16 bits of entry's first cluster
 ;   28              4                File size in bytes
 
+; FSInfo 
+; 0 	0x0 	4 	    Lead signature (must be 0x41615252 to indicate a valid FSInfo structure)
+; 4 	0x4 	480 	Reserved, these bytes should never be used
+; 484 	0x1E4 	4 	    Another signature (must be 0x61417272)
+; 488 	0x1E8 	4 	    Contains the last known free cluster count on the volume. If the value is 0xFFFFFFFF, then the free count is unknown and must be computed. 
+;                       However, this value might be incorrect and should at least be range checked (<= volume cluster count)
+;
+; 492 	0x1EC 	4 	    Indicates the cluster number at which the filesystem driver should start looking for available clusters. 
+;                       If the value is 0xFFFFFFFF, then there is no hint and the driver should start searching at 2. 
+;                       Typically this value is set to the last allocated cluster number. As the previous field, this value should be range checked.
+;
+; 496 	0x1F0 	12 	    Reserved
+; 508 	0x1FC 	4 	    Trail signature (0xAA550000)
+
+struc FAT32_FSInfo_t
+    .head_sig_dword         resd 1          ; 0x41615252
+    .reserved1              resb 480        ; fill zero
+    .body_sig_dword         resd 1          ; 0x61417272
+    .free_count_dword       resd 1
+    .next_free_dword        resd 1
+    .reserved2              resb 12         ; fill zero
+    .tail_sig_dword         resd 1          ; 0xAA550000
+endstruc
+
 struc FAT32_SFN_t
-    .label                resb 11
+    .label_83               resb 11
-    .attributes_8       resb 1
+    .attributes_byte        resb 1
-    .nt_res_8           resb 1
+    .nt_res_byte            resb 1
-    .csec_8             resb 1
+    .csec_byte              resb 1
-    .ctime_16           resb 2
+    .ctime_word             resb 2
-    .cdate_16           resb 2
+    .cdate_word             resb 2
-    .adate_16           resb 2
+    .adate_word             resb 2
     .cluster_16_high        resb 2
-    .mtime_16           resb 2
+    .mtime_word             resb 2
-    .mdate_16           resb 2
+    .mdate_word             resb 2
     .cluster_16_low         resb 2
-    .size_32            resb 4
+    .size_dword             resb 4
 endstruc
 
 ; ## Long file name (LFN) structure format ##
@@ -176,41 +195,14 @@ struc FAT32_LFN_t
     .lfn_last2              resb 4
 endstruc
 
-; FSInfo 
-; 0 	0x0 	4 	    Lead signature (must be 0x41615252 to indicate a valid FSInfo structure)
-; 4 	0x4 	480 	Reserved, these bytes should never be used
-; 484 	0x1E4 	4 	    Another signature (must be 0x61417272)
-; 488 	0x1E8 	4 	    Contains the last known free cluster count on the volume. If the value is 0xFFFFFFFF, then the free count is unknown and must be computed. 
-;                       However, this value might be incorrect and should at least be range checked (<= volume cluster count)
-;
-; 492 	0x1EC 	4 	    Indicates the cluster number at which the filesystem driver should start looking for available clusters. 
-;                       If the value is 0xFFFFFFFF, then there is no hint and the driver should start searching at 2. 
-;                       Typically this value is set to the last allocated cluster number. As the previous field, this value should be range checked.
-;
-; 496 	0x1F0 	12 	    Reserved
-; 508 	0x1FC 	4 	    Trail signature (0xAA550000)
-
-struc FAT32_FSInfo_t
-    .head_signature_32         resd 1
-    .reserved1                 resb 480
-    .body_signature_32         resd 1
-    .free_cluster_count_32     resd 1
-    .first_avail_cluster_32    resd 1
-    .reserved2                 resd 3
-    .tail_signature_32         resd 1
-endstruc
-
-
 ; 32 bytes
 struc FAT32_State_t
-    .first_root_dir_sector_32 resd 1
     .first_data_sector_32     resd 1
     .first_fat_sector_32      resd 1
     .fat_size_32              resd 1
-    .active_cluster_32        resd 1
+    .curr_FAT_cluster_32      resd 1
-    .active_FAT_cluster_32    resd 1
+    .curr_dir_cluster_32      resd 1
-    .active_dir_cluster_32    resd 1
+    .curr_drive_lba_32        resd 1
-    .active_drive_lba_32      resd 1
 endstruc
 
 ; 16 bytes

include/partition_table.inc

@@ -1,22 +1,17 @@
-; Copyright (c) 2024 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 %ifndef __INC_PART_TABLE
 

include/util/bochs_magic.inc

@@ -1,22 +1,17 @@
-; Copyright (c) 2024 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 %ifndef __INC_BOCHS_DEBUG_MAGIC
 

include/util/error_func.nasm

@@ -1,22 +1,17 @@
-; Copyright (c) 2024 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 %ifndef __INC_ERROR_FUNC
 

include/util/kmem_func.nasm

@@ -1,43 +1,38 @@
-; Copyright (c) 2024 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 %ifndef __INC_KMEM_FUNC
 %include 'cdecl16.inc'
 
-; uint8_t* kmemset_byte(void* dst, uint8_t val, uint16_t len);
+; void* kmemset_byte(void* dst, uint8_t val, uint16_t len);
 ALIGN 4, db 0x90
 kmemset:
     __CDECL16_ENTRY
  .func:
-    mov     cx, [bp + 8]   ; size_t len
+    mov     cx, [bp + 8]        ; uint16_t len
-    mov     al, [bp + 6]   ; uint8_t val
+    mov     al, byte [bp + 6]   ; uint8_t val
     mov     di, [bp + 4]        ; void * dst
 
     cld
     rep     stosb
-    mov     ax, di         ; return pointer to dest
+    mov     ax, di         ; return pointer to dest + len (last elem of dest)
 .endp:
     __CDECL16_EXIT
     ret
 
-; uint8_t* kmemset(uint8_t* dest, uint8_t* src, uint8_t len);
+; uint8_t* kmemset(uint16_t* dest, uint16_t* src, uint16_t len);
 ; not overlap safe
 ALIGN 4, db 0x90
 kmemcpy:

include/util/kmemcpy5_func.nasm

@@ -1,22 +1,17 @@
-; Copyright (c) 2024 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 %ifndef __INC_KMEMCPY5_FUNC
 %include 'cdecl16.inc'

include/util/kmemset4_func.nasm

@@ -1,22 +1,17 @@
-; Copyright (c) 2024 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 %ifndef __INC_KMEMSET4_FUNC
 %include 'cdecl16.inc'

scripts/create-disk.sh

@@ -1,24 +1,19 @@
 #!/usr/bin/env bash
 
-# Copyright (c) 2023 Elaina Claus
+# Copyright (C) 2025 Elaina Claus
 # 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+#     This program is free software: you can redistribute it and/or modify
-# of this software and associated documentation files (the "Software"), to deal
+#     it under the terms of the GNU General Public License as published by
-# in the Software without restriction, including without limitation the rights
+#     the Free Software Foundation, either version 3 of the License, or
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#     (at your option) any later version.
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
 # 
-# The above copyright notice and this permission notice shall be included in all
+#     This program is distributed in the hope that it will be useful,
-# copies or substantial portions of the Software.
+#     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.
 # 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     You should have received a copy of the GNU General Public License
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
 
 if ! [ $(id -u) = 0 ]; then
    echo "Script must be run as root!" >&2
@@ -170,7 +165,7 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
         sfdisk_path="/usr/local/opt/util-linux/sbin/sfdisk"
         if [ -e $mbr_file ] && [ -e $vbr_file ]; then
         # use hdiutil to attach our empty disk image
-        ld_path_raw=$(hdiutil attach -readwrite -imagekey diskimage-class=CRawDiskImage -nomount -blocksize 512 -noverify disk.img)
+        ld_path_raw=$(hdiutil attach -readwrite -imagekey diskimage-class=CRawDiskImage -nomount -blocksize 512 -noverify /tmp/disk.img)
         ld=$(echo $ld_path_raw | sed s:/dev/::)
         ld_path="/dev/$ld"
 
@@ -193,7 +188,7 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
         unset ld
         unset ld_path_raw
 
-        ld_path_raw=$(hdiutil attach -readwrite -imagekey diskimage-class=CRawDiskImage -nomount -blocksize 512 -noverify disk.img)
+        ld_path_raw=$(hdiutil attach -readwrite -imagekey diskimage-class=CRawDiskImage -nomount -blocksize 512 -noverify /tmp/disk.img)
         ld=$(echo $ld_path_raw | grep "FDisk_partition_scheme" | awk '{print $1}' | sed s:/dev/::)
         ld_path="/dev/$ld"
 

src/mbr/mbr.nasm

@@ -1,22 +1,17 @@
-; Copyright (c) 2023 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 [BITS 16]
 [ORG 0x8C00]

src/miniboot32/BOOTi686.nasm

@@ -1,22 +1,17 @@
-; Copyright (c) 2023 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 [BITS 32]
 [ORG 0x100000]

src/stage2/stage2.nasm

@@ -1,22 +1,17 @@
-; Copyright (c) 2023 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 
 [BITS 16]
 [ORG 0x0500]                            ; IF YOU CHANGE ORG CHANGE THE SIGN OFFSET AT THE END
@@ -155,35 +150,35 @@ main:
 
     call SetTextMode
     call disable_cursor
-    print_string HelloPrompt_cstr
+    print_string HelloPrompt_info
     
     ; enable A20 gate
     call EnableA20
-    print_string A20_Enabled_OK_cstr
+    print_string A20_Enabled_OK_info
 
     ; get system memory map
     call GetMemoryMap
-    print_string MemoryMap_OK_cstr
+    print_string MemoryMap_OK_info
 
     ; enter unreal mode
     call EnterUnrealMode
-    print_string UnrealMode_OK_cstr
+    print_string UnrealMode_OK_info
 
     ; FAT Driver setup
     call InitFATDriver
-    print_string InitFATSYS_OK_cstr
+    print_string InitFATSYS_OK_info
 
     ;
     ; Find first cluster of bootable file
     call SearchFATDIR
     push dword eax      ; save first cluster of bootable file
 
-    print_string FileFound_OK_cstr
+    print_string FileFound_OK_info
     
     pop dword eax
     push dword eax      ; print Cluster of boot file
     call PrintDWORD     ; void PrintDWORD(uint32_t dword)
-    print_string NewLine_cstr
+    add sp, 0x4
 
     ; TODO: using first cluster information, start loading the kernel to memory
     ; TODO: going to need an elf parser,  some unreal mode file buffer functions to move the data
@@ -201,7 +196,7 @@ hcf:
 ALIGN 4, db 0x90
 PrintString:
     __CDECL16_ENTRY
-    mov di, [bp + 4]    ; first arg is char* 
+    mov di, [bp + 4]    ; first arg is char[] 
 .str_len:
     xor cx, cx         ; ECX = 0
     not cx             ; ECX = -1 == 0xFFFF
@@ -235,10 +230,7 @@ ALIGN 4, db 0x90
 PrintCharacter:
     __CDECL16_ENTRY
 .func:
-    mov ax, [bp + 4] ; c
+    movzx ax, byte [bp + 4]     ; AL = character c
-    mov dx, 0x00ff
-    and ax, dx
-
     mov ah, 0x0E                ; INT 0x10, AH=0x0E call
     mov bx, 0x0007              ; BH = page no. BL =Text attribute 0x07 is lightgrey font on black background
     int 0x10                    ; call video interrupt
@@ -253,7 +245,7 @@ ALIGN 4, db 0x90
 PrintDWORD:
     __CDECL16_ENTRY
 .func: 
-    lea si, [IntToHex_table]
+    mov si, IntToHex_table
     mov ebx, 16     ; base-16
 
     mov eax, dword [bp + 4]     ;val
@@ -366,40 +358,37 @@ begin_data:
 ; Strings
 ;
 ; #############
+%define CRLF 0Dh, 0Ah
 
-%macro define_str 2
-    ALIGN 16
-    %1_str:
-        db %2
-    %define str_len %strlen(%2)       ; string
-    %1_str_len:
-        dd str_len
-%endmacro
-
-; TODO: technically this is a cstr but it splices a return and newline on the end
-; TODO: this probably should be seperated out and the printing functionality should
-; TODO: place that newline and return
 %macro define_cstr 2
-%define CRLF_NUL 0Dh, 0Ah, 00h
     ALIGN 16
     %1_cstr:
-        db %2, CRLF_NUL
+        db %2, 00h
 %endmacro
 
-define_cstr HelloPrompt, "Hello from Stevia Stage2!"
+%macro define_info 2
-define_cstr A20_Enabled_OK, "A20 Enabled OK"
+    ALIGN 16
-define_cstr MemoryMap_OK, "Memory map OK"
+    %1_info:
-define_cstr UnrealMode_OK, "Unreal mode OK"
+        db %2, CRLF, 00h
-define_cstr FileFound_OK, "Found SFN entry for bootable binary, first cluster -> "
+%endmacro
-define_cstr InitFATSYS_OK, "FAT32 Driver Init..."
 
-define_cstr SearchFATDIR_INFO, "Searching FAT DIR for bootable file..."
+define_info HelloPrompt, "Hello from Stevia Stage2!"
-define_cstr NextFATCluster_INFO, "Attempting to find next FAT cluster..."
+define_info A20_Enabled_OK, "A20 Enabled OK"
-define_cstr ReadFATCluster_INFO, "Attempting to load next FAT"
+define_info MemoryMap_OK, "Memory map OK"
-define_cstr MaybeFound_Boot_INFO, "Maybe found a file...checking..."
+define_info UnrealMode_OK, "Unreal mode OK"
-define_cstr NewLine, ""
+define_info FileFound_OK, "Found SFN entry for bootable binary, first cluster -> "
+define_info InitFATSYS_OK, "FAT32 Driver Init..."
 
-define_str BootTarget, "BOOT    BIN"
+define_info SearchFATDIR, "Searching FAT DIR for bootable file..."
+define_info NextFATCluster, "Attempting to find next FAT cluster..."
+define_info ReadFATCluster, "Attempting to load next FAT"
+define_info MaybeFound_Boot, "Maybe found a file...checking..."
+
+define_cstr BootTarget, "BOOT    BIN"
+
+ALIGN 16, db 0
+BootTarget:
+    db 'BOOT    BIN'
 
 ;
 ; pre-bss init globals (generally const...but there are exceptions)

src/vbr/vbr.nasm

@@ -1,22 +1,17 @@
-; Copyright (c) 2023 Elaina Claus
+; Copyright (C) 2025 Elaina Claus
 ; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
+;     This program is free software: you can redistribute it and/or modify
-; of this software and associated documentation files (the "Software"), to deal
+;     it under the terms of the GNU General Public License as published by
-; in the Software without restriction, including without limitation the rights
+;     the Free Software Foundation, either version 3 of the License, or
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;     (at your option) any later version.
-; copies of the Software, and to permit persons to whom the Software is
-; furnished to do so, subject to the following conditions:
 ; 
-; The above copyright notice and this permission notice shall be included in all
+;     This program is distributed in the hope that it will be useful,
-; copies or substantial portions of the Software.
+;     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.
 ; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;     You should have received a copy of the GNU General Public License
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
 [BITS 16]
 [ORG 0x7C00]
 [CPU KATMAI]
@@ -126,8 +121,8 @@ main:
 
 .check_FAT_size:                     ; we only support a very specific setup of FAT32
     mov bx, fat32_bpb
-    cmp dword [bx + FAT32_bpb_t.sector_count_32], 0      ; SectorsHuge will not be set if FAT12/16
+    test word [bx + FAT32_bpb_t.unused2_ZERO_word], 0      ; TotSectors16 will not be set if FAT32
-    ja main.load_stage2
+    jz main.load_stage2
     ERROR VBR_ERROR_WRONG_FAT_SIZE
 .load_stage2:
     ; read sectors 1-(MAX_STAGE2_BYTES / 512) to stage2 entry point