DragonOS-Community/DragonOS
1
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-08 18:26:48 +00:00
Code Issues Releases Wiki Activity

🔧 修复了一些隐式类型转换

Browse Source
This commit is contained in:
fslongjin 2022-01-28 13:44:48 +08:00
parent 61f425061c
commit 012948d345
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/common/printk.c
View File

@ -346,7 +346,7 @@ static int vsprintf(char *buf, const char *fmt, va_list args)
if (qualifier == 'l')
ip = va_arg(args, long long *);
else
ip = va_arg(args, int *);
ip = (ll*)va_arg(args, int *);
*ip = str - buf;
break;

1
kernel/common/printk.h
View File

@ -122,4 +122,3 @@ static void putchar(unsigned int *fb, int Xsize, int x, int y, unsigned int FRco
#define printk(...) printk_color( WHITE, BLACK, __VA_ARGS__ )
int printk_color(unsigned int FRcolor, unsigned int BKcolor, const char*fmt, ...);

6
kernel/exception/gate.h
View File

@ -76,7 +76,7 @@ void set_gate(ul *gate_selector_addr, ul attr, unsigned char ist, ul *code_addr)
*/
void set_intr_gate(unsigned int n, unsigned char ist, void *addr)
{
set_gate(IDT_Table + n, 0x8E, ist, &addr); // p=1，DPL=0, type=E
set_gate((ul*)(IDT_Table + n), 0x8E, ist, (ul*)(&addr)); // p=1，DPL=0, type=E
}
/**
@ -88,7 +88,7 @@ void set_intr_gate(unsigned int n, unsigned char ist, void *addr)
*/
void set_trap_gate(unsigned int n, unsigned char ist, void *addr)
{
set_gate(IDT_Table + n, 0x8F, ist, &addr); // p=1，DPL=0, type=F
set_gate((ul*)(IDT_Table + n), 0x8F, ist, (ul*)(&addr)); // p=1，DPL=0, type=F
}
/**
@ -100,7 +100,7 @@ void set_trap_gate(unsigned int n, unsigned char ist, void *addr)
*/
void set_system_trap_gate(unsigned int n, unsigned char ist, void *addr)
{
set_gate(IDT_Table + n, 0xEF, ist, &addr); // p=1，DPL=3, type=F
set_gate((ul*)(IDT_Table + n), 0xEF, ist, (ul*)(&addr)); // p=1，DPL=3, type=F
}
/**