diff options
| author | Amlal <amlalelmahrouss@icloud.com> | 2024-04-26 12:29:13 +0000 |
|---|---|---|
| committer | Amlal <amlalelmahrouss@icloud.com> | 2024-04-26 12:29:13 +0000 |
| commit | 97eb8462433a831f8a02a08acfc7ca32e794d37d (patch) | |
| tree | e7cddb857e50a2cca41a5364b4240cd8c6c0ec13 /Private/Builtins | |
| parent | f7a7080d18ac2be758b242c22f020c018b1c4824 (diff) | |
| parent | 313c303fab092b1c45e615f960826375e7eef093 (diff) | |
Merged in MHR-16 (pull request #6)
MHR-16 - A lot of features and USA design.
Diffstat (limited to 'Private/Builtins')
| -rw-r--r-- | Private/Builtins/ATA/ATA.hxx | 3 | ||||
| -rw-r--r-- | Private/Builtins/Toolbox/Toolbox.hxx | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/Private/Builtins/ATA/ATA.hxx b/Private/Builtins/ATA/ATA.hxx index 66856d8a..a2ce79ba 100644 --- a/Private/Builtins/ATA/ATA.hxx +++ b/Private/Builtins/ATA/ATA.hxx @@ -102,7 +102,8 @@ #define ATA_PRIMARY 0x00 #define ATA_SECONDARY 0x01 -#define ATA_CYL_LOW 4 +#define ATA_CYL_LOW 3 +#define ATA_CYL_MID 4 #define ATA_CYL_HIGH 5 ///! IO Direction diff --git a/Private/Builtins/Toolbox/Toolbox.hxx b/Private/Builtins/Toolbox/Toolbox.hxx index b3dad30b..0c5b31c5 100644 --- a/Private/Builtins/Toolbox/Toolbox.hxx +++ b/Private/Builtins/Toolbox/Toolbox.hxx @@ -25,8 +25,8 @@ EXTERN_C NewOS::Boolean _hal_right_button_pressed(); #define ToolboxDrawOrRsrc(ImgPtr, _Height, _Width, BaseX, BaseY) \ __ToolboxCursor = 0; \ \ - for (NewOS::SizeT i = BaseX; i < _Height + BaseX; ++i) { \ - for (NewOS::SizeT u = BaseY; u < _Width + BaseY; ++u) { \ + for (NewOS::SizeT i = BaseX; i < (_Height + BaseX); ++i) { \ + for (NewOS::SizeT u = BaseY; u < (_Width + BaseY); ++u) { \ *(((volatile NewOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ i + \ @@ -40,8 +40,8 @@ EXTERN_C NewOS::Boolean _hal_right_button_pressed(); #define ToolboxDrawRsrc(ImgPtr, _Height, _Width, BaseX, BaseY) \ __ToolboxCursor = 0; \ \ - for (NewOS::SizeT i = BaseX; i < _Height + BaseX; ++i) { \ - for (NewOS::SizeT u = BaseY; u < _Width + BaseY; ++u) { \ + for (NewOS::SizeT i = BaseX; i < (_Height + BaseX); ++i) { \ + for (NewOS::SizeT u = BaseY; u < (_Width + BaseY); ++u) { \ *(((volatile NewOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ i + \ @@ -66,8 +66,8 @@ EXTERN_C NewOS::Boolean _hal_right_button_pressed(); /// @brief Draws inside a zone. #define ToolboxDrawZone(_Clr, _Height, _Width, BaseX, BaseY) \ \ - for (NewOS::SizeT i = BaseX; i < _Width + BaseX; ++i) { \ - for (NewOS::SizeT u = BaseY; u < _Height + BaseY; ++u) { \ + for (NewOS::SizeT i = BaseX; i < (_Width + BaseX); ++i) { \ + for (NewOS::SizeT u = BaseY; u < (_Height + BaseY); ++u) { \ *(((volatile NewOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ i + \ |