Spaceraven/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Compare commits

merge into: Spaceraven:main
Branches Tags
Spaceraven:main
KolibriOS:rewrite_ide_drv
KolibriOS:main
KolibriOS:change-get-version-api
Spaceraven:0.7.7.0
Spaceraven:0.7.5.0
Spaceraven:0.7.0.0
Spaceraven:0.6.5.0
Spaceraven:0.6.3.0
Spaceraven:0.6.0.0
Spaceraven:0.5.3.0
Spaceraven:0.5.2.1
KolibriOS:0.7.7.0
KolibriOS:0.7.5.0
KolibriOS:0.7.0.0
KolibriOS:0.6.5.0
KolibriOS:0.6.3.0
KolibriOS:0.6.0.0
KolibriOS:0.5.3.0
KolibriOS:0.5.2.1
...
pull from: KolibriOS:main
Branches Tags
KolibriOS:rewrite_ide_drv
KolibriOS:main
KolibriOS:change-get-version-api
Spaceraven:main
KolibriOS:0.7.7.0
KolibriOS:0.7.5.0
KolibriOS:0.7.0.0
KolibriOS:0.6.5.0
KolibriOS:0.6.3.0
KolibriOS:0.6.0.0
KolibriOS:0.5.3.0
KolibriOS:0.5.2.1
Spaceraven:0.7.7.0
Spaceraven:0.7.5.0
Spaceraven:0.7.0.0
Spaceraven:0.6.5.0
Spaceraven:0.6.3.0
Spaceraven:0.6.0.0
Spaceraven:0.5.3.0
Spaceraven:0.5.2.1

4 Commits
main ... main

Author SHA1 Message Date
Serhii Sakhno
975284f5f3 Eolite: provide label for NVMe disks on left panel 
Signed-off-by: Serhii Sakhno <serhii.sakhno.jr@gmail.com>
 2024-08-01 22:29:57 +03:00
Gleb Zaharov
8ece779b4b Merge pull request 'Extra comma in ksys.h' (#79) from Egor00f/kolibrios:main into main 
Reviewed-on: KolibriOS/kolibrios#79
Reviewed-by: Gleb Zaharov <sweetbread@coders-squad.com>
 2024-07-23 00:41:58 +02:00
Egor00f
a218a83bd5 Fix ksys.h 
Extra comma in ksys_draw_bitmap_palette function
 2024-07-22 22:18:31 +00:00
Mikhail Frolov
c762489408 Merge pull request 'Correction of error' (#80) from Spaceraven/kolibrios:main into main 
Reviewed-on: KolibriOS/kolibrios#80
Reviewed-by: Mikhail Frolov <mixa.frolov2003@gmail.com>
 2024-07-17 20:42:05 +02:00
2 changed files with 6 additions and 3 deletions
Show Stats Expand all files Collapse all files

6
contrib/sdk/sources/newlib/libc/include/sys/ksys.h
View File

@ -1223,10 +1223,10 @@ KOSAPI void _ksys_debug_puts(const char* s)
KOSAPI void ksys_draw_bitmap_palette(void* bitmap, int x, int y, int w, int h, int bpp, void* palette, int offset) KOSAPI void ksys_draw_bitmap_palette(void* bitmap, int x, int y, int w, int h, int bpp, void* palette, int offset)
{ {
asm_inline( asm_inline(
"pushl %%ebp,\n\t" // save EBP register "pushl %%ebp\n\t" // save EBP register
"movl 0x24(%%ebp), %%ebp\n\t" // 0x24 - "offset" param "movl 0x24(%%ebp), %%ebp\n\t" // 0x24 - "offset" param
"int $0x40\n\t" "int $0x40\n\t"
"popl %%ebp" // restore EBP register "popl %%ebp" // restore EBP register
: :
: "a"(65), : "a"(65),
"b"(bitmap), "b"(bitmap),

3
programs/cmm/eolite/include/const.h
View File

@ -62,6 +62,7 @@ char *actions[] = {
#define T_FD "„¨áª¥â  " #define T_FD "„¨áª¥â  "
#define T_HD "†¥á⪨© ¤¨áª " #define T_HD "†¥á⪨© ¤¨áª "
#define T_SATA "SATA ¤¨áª " #define T_SATA "SATA ¤¨áª "
#define T_NVME "NVMe disk "
#define T_USB "USB ¤¨áª " #define T_USB "USB ¤¨áª "
#define T_RAM "RAM ¤¨áª " #define T_RAM "RAM ¤¨áª "
#define T_UNC "<22>¥¨§¢¥áâ­® " #define T_UNC "<22>¥¨§¢¥áâ­® "
@ -160,6 +161,7 @@ char *actions[] = {
#define T_FD "Floppy disk " #define T_FD "Floppy disk "
#define T_HD "Hard disk " #define T_HD "Hard disk "
#define T_SATA "SATA disk " #define T_SATA "SATA disk "
#define T_NVME "NVMe disk "
#define T_USB "USB disk " #define T_USB "USB disk "
#define T_RAM "RAM disk " #define T_RAM "RAM disk "
#define T_UNC "Unknown " #define T_UNC "Unknown "
@ -252,6 +254,7 @@ char *devinfo = {
"hd", 4, T_HD, "hd", 4, T_HD,
"bd", 4, T_HD, "bd", 4, T_HD,
"sd", 4, T_SATA, "sd", 4, T_SATA,
"nv", 4, T_NVME,
"tm", 5, T_RAM, "tm", 5, T_RAM,
"us", 6, T_USB, "us", 6, T_USB,
0 0