diff options
| author | Anssi Hannula <anssi@mandriva.org> | 2010-01-02 02:26:13 +0000 |
|---|---|---|
| committer | Anssi Hannula <anssi@mandriva.org> | 2010-01-02 02:26:13 +0000 |
| commit | bbec6da3b66ec8c11faa2e78838a1d5cd1fe65cc (patch) | |
| tree | 268faff9cf7aa6ce57a3c2c600a843de2e4f1e37 | |
| parent | 02eba4f24bcb783e733c51f675d8fb49e37ba94e (diff) | |
| download | monitor-edid-bbec6da3b66ec8c11faa2e78838a1d5cd1fe65cc.tar monitor-edid-bbec6da3b66ec8c11faa2e78838a1d5cd1fe65cc.tar.gz monitor-edid-bbec6da3b66ec8c11faa2e78838a1d5cd1fe65cc.tar.bz2 monitor-edid-bbec6da3b66ec8c11faa2e78838a1d5cd1fe65cc.tar.xz monitor-edid-bbec6da3b66ec8c11faa2e78838a1d5cd1fe65cc.zip | |
Fix some compiler warnings.
| -rw-r--r-- | monitor-get-edid-using-vbe.c | 4 | ||||
| -rw-r--r-- | vbe.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/monitor-get-edid-using-vbe.c b/monitor-get-edid-using-vbe.c index 1bf0759..ba04224 100644 --- a/monitor-get-edid-using-vbe.c +++ b/monitor-get-edid-using-vbe.c @@ -48,8 +48,8 @@ int main(int argc, char **argv) size = get_edid(edid, port); /* restore */ - ioctl(fd, VT_ACTIVATE, current.v_active) == 0 && - ioctl(fd, VT_WAITACTIVE, current.v_active) == 0; + if (ioctl(fd, VT_ACTIVATE, current.v_active) == 0) + ioctl(fd, VT_WAITACTIVE, current.v_active); } close(fd); } @@ -137,8 +137,8 @@ static int vbe_check_vbe_info(void) /* set up registers for the interrupt call. */ memset(®s, 0, sizeof(regs)); regs.eax = 0x4f00; - regs.es = (u_int32_t)(mem - LRMI_base_addr()) >> 4; - regs.edi = (u_int32_t)(mem - LRMI_base_addr()) & 0x0f; + regs.es = (uintptr_t)(mem - LRMI_base_addr()) >> 4; + regs.edi = (uintptr_t)(mem - LRMI_base_addr()) & 0x0f; memcpy(mem, "VBE2", 4); /* do it. */ @@ -231,8 +231,8 @@ static int vbe_get_edid_info(char *edid, int port) regs.eax = 0x4f15; regs.ebx = 0x0001; regs.ecx = port; - regs.es = (u_int32_t)(mem - LRMI_base_addr()) >> 4; - regs.edi = (u_int32_t)(mem - LRMI_base_addr()) & 0x0f; + regs.es = (uintptr_t)(mem - LRMI_base_addr()) >> 4; + regs.edi = (uintptr_t)(mem - LRMI_base_addr()) & 0x0f; /* do it. */ iopl(3); |