From ebdb22de9289168eac7b28aca264163a8b8bf1eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Thu, 10 May 2018 15:10:29 +0200 Subject: [PATCH] Fix ps2 debug build on x86_64 Change-Id: I579656b6b0619b44aa4a02c87720762cb5dd1415 --- .../kernel/bus_managers/ps2/ps2_alps.cpp | 2 +- .../kernel/bus_managers/ps2/ps2_elantech.cpp | 17 +++++++++-------- .../kernel/bus_managers/ps2/ps2_service.cpp | 2 +- .../bus_managers/ps2/ps2_standard_mouse.cpp | 4 ++-- .../kernel/bus_managers/ps2/ps2_synaptics.cpp | 8 +++++--- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp index 0bc1dec746..06e2fa01ea 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp @@ -538,7 +538,7 @@ alps_ioctl(void *_cookie, uint32 op, void *buffer, size_t length) sizeof(bigtime_t)); default: - TRACE("ALPS: unknown opcode: %ld\n", op); + TRACE("ALPS: unknown opcode: %" B_PRIu32 "\n", op); return B_BAD_VALUE; } } diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp index 6ec921a6f5..9bb4c79479 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp @@ -168,8 +168,8 @@ get_elantech_movement(elantech_cookie *cookie, mouse_movement *movement) event.xPosition = ((event_buffer[1] & 0xf) << 8) | event_buffer[2]; event.yPosition = (((event_buffer[4] & 0xf) << 8) | event_buffer[5]); - TRACE("ELANTECH: buttons 0x%x x %ld y %ld z %d\n", - event.buttons, event.xPosition, event.yPosition, + TRACE("ELANTECH: buttons 0x%x x %" B_PRIu32 " y %" B_PRIu32 + " z %d\n", event.buttons, event.xPosition, event.yPosition, event.zPressure); break; case 2: @@ -566,8 +566,8 @@ elantech_open(const char *name, uint32 flags, void **_cookie) goto err4; } } - TRACE("ELANTECH: version 0x%lx (0x%lx)\n", cookie->version, - cookie->fwVersion); + TRACE("ELANTECH: version 0x%" B_PRIu32 " (0x%" B_PRIu32 ")\n", + cookie->version, cookie->fwVersion); if (cookie->version >= 3) cookie->send_command = &elantech_dev_send_command; @@ -593,8 +593,8 @@ elantech_open(const char *name, uint32 flags, void **_cookie) goto err4; } - TRACE("ELANTECH: range x %ld-%ld y %ld-%ld (%ld)\n", x_min, x_max, - y_min, y_max, width); + TRACE("ELANTECH: range x %" B_PRIu32 "-%" B_PRIu32 " y %" B_PRIu32 + "-%" B_PRIu32 " (%" B_PRIu32 ")\n", x_min, x_max, y_min, y_max, width); uint32 x_res, y_res; if (get_resolution_v4(cookie, &x_res, &y_res) != B_OK) { @@ -602,7 +602,8 @@ elantech_open(const char *name, uint32 flags, void **_cookie) goto err4; } - TRACE("ELANTECH: resolution x %ld y %ld (dpi)\n", x_res, y_res); + TRACE("ELANTECH: resolution x %" B_PRIu32 " y %" B_PRIu32 " (dpi)\n", + x_res, y_res); gHardwareSpecs.edgeMotionWidth = EDGE_MOTION_WIDTH; @@ -707,7 +708,7 @@ elantech_ioctl(void *_cookie, uint32 op, void *buffer, size_t length) sizeof(bigtime_t)); default: - TRACE("ELANTECH: unknown opcode: %ld\n", op); + TRACE("ELANTECH: unknown opcode: %" B_PRIu32 "\n", op); return B_BAD_VALUE; } } diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp index 1bf5ed3299..ec8abae86a 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp @@ -124,7 +124,7 @@ ps2_service_thread(void *arg) break; default: - TRACE("ps2: PS2_SERVICE: unknown id %lu\n", cmd.id); + TRACE("ps2: PS2_SERVICE: unknown id %" B_PRIu32 "\n", cmd.id); break; } } else { diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_standard_mouse.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_standard_mouse.cpp index e9647f9a1d..d274737867 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_standard_mouse.cpp +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_standard_mouse.cpp @@ -144,7 +144,7 @@ ps2_packet_to_movement(standard_mouse_cookie* cookie, uint8 packet[], pos->wheel_xdelta = xDeltaWheel; TRACE("ps2: ps2_packet_to_movement xdelta: %d, ydelta: %d, buttons %x, " - "clicks: %d, timestamp %Ld\n", + "clicks: %d, timestamp %" B_PRIdBIGTIME "\n", xDelta, yDelta, buttons, cookie->click_count, currentTime); } } @@ -493,7 +493,7 @@ standard_mouse_ioctl(void* _cookie, uint32 op, void* buffer, size_t length) return user_memcpy(&cookie->click_speed, buffer, sizeof(bigtime_t)); default: - TRACE("ps2: ioctl unknown mouse opcode: %ld\n", op); + TRACE("ps2: ioctl unknown mouse opcode: %" B_PRIu32 "\n", op); return B_DEV_INVALID_IOCTL; } } diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.cpp index 81cffc1514..7c474ced28 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.cpp +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.cpp @@ -266,8 +266,10 @@ passthrough_command(ps2_dev *dev, uint8 cmd, const uint8 *out, int outCount, finalize: status_t statusOfEnable = ps2_dev_command(dev->parent_dev, PS2_CMD_ENABLE, NULL, 0, NULL, 0); - if (statusOfEnable != B_OK) - TRACE("SYNAPTICS: enabling of parent failed: 0x%lx.\n", statusOfEnable); + if (statusOfEnable != B_OK) { + TRACE("SYNAPTICS: enabling of parent failed: 0x%" B_PRIx32 ".\n", + statusOfEnable); + } return status != B_OK ? status : statusOfEnable; } @@ -522,7 +524,7 @@ synaptics_ioctl(void *_cookie, uint32 op, void *buffer, size_t length) sizeof(bigtime_t)); default: - TRACE("SYNAPTICS: unknown opcode: %ld\n", op); + TRACE("SYNAPTICS: unknown opcode: %" B_PRIu32 "\n", op); return B_DEV_INVALID_IOCTL; } }