hrev53218 adds 1 changeset to branch 'master'
old head: 66fa08aa81d6a95f8d20cf2d7bc5b3c3472cbfd2
new head: b2de0c59cb846e79ad6b2714803796311575d5fa
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=b2de0c59cb84+%5E66fa08aa81d6
----------------------------------------------------------------------------
b2de0c59cb84: drivers/graphics/intel_810: fix -Wformat
Change-Id: Ia52bbcdc98847910c36bb1495418dbb3f0bc3cb0
Reviewed-on: https://review.haiku-os.org/c/1543
Reviewed-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
[ Murai Takashi <tmurai01@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev53218
Commit: b2de0c59cb846e79ad6b2714803796311575d5fa
URL: https://git.haiku-os.org/haiku/commit/?id=b2de0c59cb84
Author: Murai Takashi <tmurai01@xxxxxxxxx>
Date: Tue Jun 25 11:11:09 2019 UTC
Committer: Jérôme Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Sat Jun 29 10:44:39 2019 UTC
----------------------------------------------------------------------------
1 file changed, 14 insertions(+), 12 deletions(-)
.../kernel/drivers/graphics/intel_810/driver.cpp | 26 +++++++++++---------
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/graphics/intel_810/driver.cpp
b/src/add-ons/kernel/drivers/graphics/intel_810/driver.cpp
index cdf752a020..2ec80041ba 100644
--- a/src/add-ons/kernel/drivers/graphics/intel_810/driver.cpp
+++ b/src/add-ons/kernel/drivers/graphics/intel_810/driver.cpp
@@ -290,7 +290,7 @@ InitDevice(DeviceInfo& di)
(void**)&di.regs);
if (si.regsArea < 0) {
- TRACE("Unable to map MMIO, error: 0x%lx\n", si.regsArea);
+ TRACE("Unable to map MMIO, error: 0x%" B_PRIx32 "\n",
si.regsArea);
return si.regsArea;
}
@@ -302,7 +302,7 @@ InitDevice(DeviceInfo& di)
B_READ_AREA | B_WRITE_AREA);
if (di.gttArea < B_OK) {
- TRACE("Unable to create GTT, error: 0x%lx\n", di.gttArea);
+ TRACE("Unable to create GTT, error: 0x%" B_PRIx32 "\n",
di.gttArea);
return B_NO_MEMORY;
}
@@ -314,7 +314,8 @@ InitDevice(DeviceInfo& di)
status_t status = get_memory_map((void *)(di.gttAddr),
B_PAGE_SIZE, &entry, 1);
if (status < B_OK) {
- TRACE("Unable to get physical address of GTT, error: 0x%lx\n",
status);
+ TRACE("Unable to get physical address of GTT, "
+ "error: 0x%" B_PRIx32 "\n", status);
return status;
}
@@ -328,7 +329,8 @@ InitDevice(DeviceInfo& di)
B_ANY_ADDRESS, si.videoMemSize, B_FULL_LOCK,
B_READ_AREA | B_WRITE_AREA);
if (si.videoMemArea < B_OK) {
- TRACE("Unable to create video memory, error: 0x%lx\n",
si.videoMemArea);
+ TRACE("Unable to create video memory, error: 0x%" B_PRIx32 "\n",
+ si.videoMemArea);
return B_NO_MEMORY;
}
@@ -340,7 +342,7 @@ InitDevice(DeviceInfo& di)
B_PAGE_SIZE, &entry, 1);
if (status < B_OK) {
TRACE("Unable to get physical address of video memory
page, error:"
- " 0x%lx offset: %ld\n", status, offset);
+ " 0x%" B_PRIx32 " offset: %" B_PRId32 "\n",
status, offset);
return status;
}
@@ -428,7 +430,7 @@ init_hardware(void)
status_t status = get_module(B_PCI_MODULE_NAME, (module_info**)&gPCI);
if (status != B_OK) {
- TRACE("PCI module unavailable, error 0x%lx\n", status);
+ TRACE("PCI module unavailable, error 0x%" B_PRIx32 "\n",
status);
return status;
}
@@ -454,7 +456,7 @@ init_driver(void)
status_t status = get_module(B_PCI_MODULE_NAME, (module_info**)&gPCI);
if (status != B_OK) {
- TRACE("PCI module unavailable, error 0x%lx\n", status);
+ TRACE("PCI module unavailable, error 0x%" B_PRIx32 "\n",
status);
return status;
}
@@ -496,7 +498,7 @@ init_driver(void)
gDeviceNames[count] = NULL; // terminate list with null pointer
- TRACE("init_driver() %ld supported devices\n", count);
+ TRACE("init_driver() %" B_PRIu32 " supported devices\n", count);
return B_OK;
}
@@ -571,8 +573,8 @@ device_open(const char* name, uint32 /*flags*/, void**
cookie)
*cookie = &di; // send cookie to opener
}
- TRACE("device_open() returning 0x%lx, open count: %ld\n", status,
- di.openCount);
+ TRACE("device_open() returning 0x%" B_PRIx32 ", "
+ "open count: %" B_PRId32 "\n", status, di.openCount);
return status;
}
@@ -634,7 +636,7 @@ device_free(void* dev)
gLock.Release(); // unlock driver
- TRACE("exit device_free() openCount: %ld\n", di.openCount);
+ TRACE("exit device_free() openCount: %" B_PRId32 "\n", di.openCount);
return B_OK;
}
@@ -644,7 +646,7 @@ device_ioctl(void* dev, uint32 msg, void* buffer, size_t
bufferLength)
{
DeviceInfo& di = *((DeviceInfo*)dev);
- TRACE("device_ioctl(); ioctl: %lu, buffer: 0x%" B_PRIXADDR ", "
+ TRACE("device_ioctl(); ioctl: %" B_PRIu32 ", buffer: 0x%" B_PRIXADDR ",
"
"bufLen: %lu\n", msg, (addr_t)buffer, bufferLength);
switch (msg) {
