KolibriOS/kolibrios
13
4
Fork 11
Code Issues 78 Pull Requests 5 Projects Releases Activity

Compare commits

base: KolibriOS:main
Branches Tags
KolibriOS:main
KolibriOS:rewrite_ide_drv
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
..
compare: Spaceraven:main
Branches Tags
Spaceraven:main
KolibriOS:main
KolibriOS:rewrite_ide_drv
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

No commits in common. "main" and "main" have entirely different histories.
main ... main

2 changed files with 3 additions and 6 deletions
Show Stats Expand all files Collapse all files

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

@ -1223,7 +1223,7 @@ 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

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

@ -62,7 +62,6 @@ 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>¥¨§¢¥áâ­® "
@ -161,7 +160,6 @@ 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 "
@ -254,7 +252,6 @@ 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