hrev53421 adds 9 changesets to branch 'master'
old head: 3f388e607f400ccd68246c9680ebe79332d3366d
new head: 42630943fd02c8e5f83f618f54e58d9899b6e4d6
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=42630943fd02+%5E3f388e607f40
----------------------------------------------------------------------------
a7288ebd8f71: firewire: Fix invalid type cast
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: I09213ff1264d2662f3e360c0bf871c25e3849fb7
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1775
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
7d6cb3e3c57a: acpi_ac.cpp: Fix invalid preprocessor macro
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: I7984ffed7e634a37dabb10e2fa96330a97a0d98f
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1776
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
cca5be407e88: rule_based_prefetcher.cpp: Fix function prototype
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: Ic0d961266a6aebf31c711c466fb3ff5a5b1b50ff
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1777
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
5d1791071ef0: PPPoEDevice.cpp: Add missing header for htons
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: Icbb7d71a155da2ecbeaba578bdf022dac7b4d04f
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1778
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
458e37756b75: 3dfx: Fix invalid type cast on 64bit
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: Iba685cca20c31c91c8931d25e0f86ac9c9bef6bb
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1779
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
ea9bcf517a0d: neomagic: Fix invalid print format
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: I1ab9ab87328a6e39c73c5e96095c1cfb424e4bc2
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1780
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
3ac18ca76669: s3: Fix 64bit portability cast
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: I14486e5f1cc73c856f9db7373a398a567df0607c
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1781
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
0cc862ea3be3: firewire: Fix invalid cast
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: I47faf4d2a54602e3c842c52507ecf7cba5c66cf5
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1782
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
42630943fd02: transform_procs.c: Add missing include file for prototype
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: I916842c5cb415759ebca8ae36e6dac3006daad0b
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1783
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
[ Jaroslaw Pelczar <jarek@xxxxxxxxxxxx> ]
----------------------------------------------------------------------------
9 files changed, 14 insertions(+), 11 deletions(-)
src/add-ons/accelerants/3dfx/3dfx_overlay.cpp | 2 +-
src/add-ons/accelerants/neomagic/Overlay.c | 4 ++--
src/add-ons/accelerants/s3/virge_edid.cpp | 4 ++--
src/add-ons/kernel/bus_managers/firewire/firewire.cpp | 4 ++--
src/add-ons/kernel/bus_managers/firewire/fwohci.cpp | 2 +-
src/add-ons/kernel/busses/scsi/usb/transform_procs.c | 2 ++
src/add-ons/kernel/drivers/power/acpi_ac/acpi_ac.cpp | 4 ++--
src/add-ons/kernel/file_cache/rule_based_prefetcher.cpp | 2 +-
src/add-ons/kernel/network/ppp/pppoe/PPPoEDevice.cpp | 1 +
############################################################################
Commit: a7288ebd8f718a4ef00148dfcc6f53f0f3f8eaea
URL: https://git.haiku-os.org/haiku/commit/?id=a7288ebd8f71
Author: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Date: Wed Aug 28 15:08:04 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Aug 30 14:15:09 2019 UTC
firewire: Fix invalid type cast
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: I09213ff1264d2662f3e360c0bf871c25e3849fb7
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1775
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/bus_managers/firewire/firewire.cpp
b/src/add-ons/kernel/bus_managers/firewire/firewire.cpp
index 3f2f458f24..59e7492c04 100644
--- a/src/add-ons/kernel/bus_managers/firewire/firewire.cpp
+++ b/src/add-ons/kernel/bus_managers/firewire/firewire.cpp
@@ -1174,7 +1174,7 @@ fw_xfer_alloc_buf(int send_len, int recv_len)
return(NULL);
}
xfer->send.payload = (uint32_t *)send_virt;
- xfer->send.bus_addr = (bus_addr_t)send_phy;
+ xfer->send.bus_addr = (bus_addr_t)(addr_t)send_phy;
}
if (recv_len > 0) {
/* xfer->recv.payload = malloc(recv_len);
@@ -1196,7 +1196,7 @@ fw_xfer_alloc_buf(int send_len, int recv_len)
return(NULL);
}
xfer->recv.payload = (uint32_t *)recv_virt;
- xfer->recv.bus_addr = (bus_addr_t)recv_phy;
+ xfer->recv.bus_addr = (bus_addr_t)(addr_t)recv_phy;
}
return(xfer);
}
############################################################################
Commit: 7d6cb3e3c57a035f8878703dd127e4c765481ccc
URL: https://git.haiku-os.org/haiku/commit/?id=7d6cb3e3c57a
Author: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Date: Wed Aug 28 15:08:22 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Aug 30 14:15:09 2019 UTC
acpi_ac.cpp: Fix invalid preprocessor macro
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: I7984ffed7e634a37dabb10e2fa96330a97a0d98f
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1776
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/power/acpi_ac/acpi_ac.cpp
b/src/add-ons/kernel/drivers/power/acpi_ac/acpi_ac.cpp
index 2f088b39d7..ad0edaeb72 100644
--- a/src/add-ons/kernel/drivers/power/acpi_ac/acpi_ac.cpp
+++ b/src/add-ons/kernel/drivers/power/acpi_ac/acpi_ac.cpp
@@ -24,11 +24,11 @@
#define TRACE_AC
#ifdef TRACE_AC
-# define TRACE(x...) dprintf("acpi_ac: "x)
+# define TRACE(x...) dprintf("acpi_ac: " x)
#else
# define TRACE(x...)
#endif
-#define ERROR(x...) dprintf("acpi_ac: "x)
+#define ERROR(x...) dprintf("acpi_ac: " x)
static device_manager_info *sDeviceManager;
############################################################################
Commit: cca5be407e88ba0d6ed0992d730a92c2f7b109ae
URL: https://git.haiku-os.org/haiku/commit/?id=cca5be407e88
Author: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Date: Wed Aug 28 15:08:38 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Aug 30 14:15:09 2019 UTC
rule_based_prefetcher.cpp: Fix function prototype
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: Ic0d961266a6aebf31c711c466fb3ff5a5b1b50ff
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1777
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/file_cache/rule_based_prefetcher.cpp
b/src/add-ons/kernel/file_cache/rule_based_prefetcher.cpp
index 064874fb58..c1c033531b 100644
--- a/src/add-ons/kernel/file_cache/rule_based_prefetcher.cpp
+++ b/src/add-ons/kernel/file_cache/rule_based_prefetcher.cpp
@@ -680,7 +680,7 @@ RuleMatcher::GotArguments(int32 argCount, char * const
*args)
static void
-node_opened(void *vnode, int32 fdType, mount_id device, vnode_id parent,
+node_opened(struct vnode *vnode, int32 fdType, dev_t device, vnode_id parent,
vnode_id node, const char *name, off_t size)
{
if (device < gBootDevice) {
############################################################################
Commit: 5d1791071ef0bc8149ccde69a92ec080e6d38788
URL: https://git.haiku-os.org/haiku/commit/?id=5d1791071ef0
Author: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Date: Wed Aug 28 15:09:36 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Aug 30 14:15:09 2019 UTC
PPPoEDevice.cpp: Add missing header for htons
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: Icbb7d71a155da2ecbeaba578bdf022dac7b4d04f
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1778
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/network/ppp/pppoe/PPPoEDevice.cpp
b/src/add-ons/kernel/network/ppp/pppoe/PPPoEDevice.cpp
index 4849b9f0f7..0b290321eb 100644
--- a/src/add-ons/kernel/network/ppp/pppoe/PPPoEDevice.cpp
+++ b/src/add-ons/kernel/network/ppp/pppoe/PPPoEDevice.cpp
@@ -8,6 +8,7 @@
#include <ByteOrder.h>
#include <net/if_dl.h>
#include <net_stack.h>
+#include <arpa/inet.h>
#include <ethernet.h>
#include <ether_driver.h>
############################################################################
Commit: 458e37756b75507f76844fa7ef274537b34ff32e
URL: https://git.haiku-os.org/haiku/commit/?id=458e37756b75
Author: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Date: Wed Aug 28 15:18:08 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Aug 30 14:15:09 2019 UTC
3dfx: Fix invalid type cast on 64bit
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: Iba685cca20c31c91c8931d25e0f86ac9c9bef6bb
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1779
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/accelerants/3dfx/3dfx_overlay.cpp
b/src/add-ons/accelerants/3dfx/3dfx_overlay.cpp
index 1b07ff2795..40e67eb7b4 100644
--- a/src/add-ons/accelerants/3dfx/3dfx_overlay.cpp
+++ b/src/add-ons/accelerants/3dfx/3dfx_overlay.cpp
@@ -100,7 +100,7 @@ TDFX_DisplayOverlay(const overlay_window* window,
// Add width of overlay buffer to stride.
uint32 stride = INREG32(VIDEO_DESKTOP_OVERLAY_STRIDE) & 0x0000ffff;
stride |= (buffer->width << 1) << 16;
- uint32 offset = (uint32)buffer->buffer_dma;
+ uint32 offset = (uint32)(addr_t)buffer->buffer_dma;
TDFX_WaitForFifo(2);
############################################################################
Commit: ea9bcf517a0db58445dcfad444fd76d02ff8d948
URL: https://git.haiku-os.org/haiku/commit/?id=ea9bcf517a0d
Author: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Date: Wed Aug 28 15:18:16 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Aug 30 14:15:09 2019 UTC
neomagic: Fix invalid print format
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: I1ab9ab87328a6e39c73c5e96095c1cfb424e4bc2
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1780
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/accelerants/neomagic/Overlay.c
b/src/add-ons/accelerants/neomagic/Overlay.c
index 98a5919493..7c1f45f9be 100644
--- a/src/add-ons/accelerants/neomagic/Overlay.c
+++ b/src/add-ons/accelerants/neomagic/Overlay.c
@@ -75,8 +75,8 @@ const overlay_buffer *ALLOCATE_OVERLAY_BUFFER(color_space cs,
uint16 width, uint
/* acquire the shared benaphore */
AQUIRE_BEN(si->overlay.lock)
- LOG(4,("Overlay: cardRAM_start =
$%08x\n",(uint32)((uint8*)si->framebuffer)));
- LOG(4,("Overlay: cardRAM_start_DMA =
$%08x\n",(uint32)((uint8*)si->framebuffer_pci)));
+ LOG(4,("Overlay: cardRAM_start = $%p\n",((uint8*)si->framebuffer)));
+ LOG(4,("Overlay: cardRAM_start_DMA =
$%p\n",((uint8*)si->framebuffer_pci)));
LOG(4,("Overlay: cardRAM_size = %dKb\n",si->ps.memory_size));
/* find first empty slot (room for another buffer?) */
############################################################################
Commit: 3ac18ca7666975f198c3b71417b911cc17402655
URL: https://git.haiku-os.org/haiku/commit/?id=3ac18ca76669
Author: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Date: Wed Aug 28 15:18:33 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Aug 30 14:15:09 2019 UTC
s3: Fix 64bit portability cast
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: I14486e5f1cc73c856f9db7373a398a567df0607c
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1781
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/accelerants/s3/virge_edid.cpp
b/src/add-ons/accelerants/s3/virge_edid.cpp
index abad312c43..c1e58de595 100644
--- a/src/add-ons/accelerants/s3/virge_edid.cpp
+++ b/src/add-ons/accelerants/s3/virge_edid.cpp
@@ -22,7 +22,7 @@
static status_t
GetI2CSignals_Alt(void* cookie, int* _clock, int* data)
{
- uint32 index = (uint32)cookie;
+ uint32 index = (uint32)(addr_t)cookie;
uint8 value = ReadCrtcReg(index);
*_clock = (value & 0x4) != 0;
@@ -34,7 +34,7 @@ GetI2CSignals_Alt(void* cookie, int* _clock, int* data)
static status_t
SetI2CSignals_Alt(void* cookie, int _clock, int data)
{
- uint32 index = (uint32)cookie;
+ uint32 index = (uint32)(addr_t)cookie;
uint8 value = 0x10;
if (_clock)
############################################################################
Commit: 0cc862ea3be3e394324dd5ad379c0c7de78d454c
URL: https://git.haiku-os.org/haiku/commit/?id=0cc862ea3be3
Author: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Date: Wed Aug 28 15:18:42 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Aug 30 14:15:09 2019 UTC
firewire: Fix invalid cast
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: I47faf4d2a54602e3c842c52507ecf7cba5c66cf5
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1782
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/bus_managers/firewire/fwohci.cpp
b/src/add-ons/kernel/bus_managers/firewire/fwohci.cpp
index 8a69683ae8..8dcfdfc2b1 100644
--- a/src/add-ons/kernel/bus_managers/firewire/fwohci.cpp
+++ b/src/add-ons/kernel/bus_managers/firewire/fwohci.cpp
@@ -705,7 +705,7 @@ fwohci_init(struct fwohci_softc *sc)
if (sc->fc.crom_sid_Area < B_OK)
return B_NO_MEMORY;
sc->sid_buf = (uint32_t*)(sc->sid_dma.v_addr = buf_virt);
- sc->sid_dma.bus_addr = (bus_addr_t)buf_phy;
+ sc->sid_dma.bus_addr = (bus_addr_t)(addr_t)buf_phy;
sc->fc.config_rom
= (uint32_t*)(sc->crom_dma.v_addr = (char*)buf_virt +
OHCI_SIDSIZE);
sc->crom_dma.bus_addr = (bus_addr_t)buf_phy + OHCI_SIDSIZE;
############################################################################
Revision: hrev53421
Commit: 42630943fd02c8e5f83f618f54e58d9899b6e4d6
URL: https://git.haiku-os.org/haiku/commit/?id=42630943fd02
Author: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Date: Wed Aug 28 15:18:53 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Aug 30 14:15:09 2019 UTC
transform_procs.c: Add missing include file for prototype
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: I916842c5cb415759ebca8ae36e6dac3006daad0b
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1783
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/busses/scsi/usb/transform_procs.c
b/src/add-ons/kernel/busses/scsi/usb/transform_procs.c
index 8245977460..702a4ddbd7 100644
--- a/src/add-ons/kernel/busses/scsi/usb/transform_procs.c
+++ b/src/add-ons/kernel/busses/scsi/usb/transform_procs.c
@@ -17,6 +17,8 @@
#include "settings.h"
#include "strings.h"
+#include <string.h>
+
#define UFI_COMMAND_LEN 12
#define ATAPI_COMMAND_LEN 12