[haiku-commits] BRANCH xyzzy-github.x86_64 - src/add-ons/kernel/drivers/network/sis900 src/preferences/virtualmemory src/add-ons/translators/gif src/add-ons/kernel/drivers/network/wb840 build/jam
- From: xyzzy-github.x86_64 <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 18 Aug 2012 13:49:18 +0200 (CEST)
added 6 changesets to branch 'refs/remotes/xyzzy-github/x86_64'
old head: 816aded4c161cb68946562c79e05c5a7eb145268
new head: f3780ae8b2dcd5ae3b30bb9c4ffc36cbac58f3fe
----------------------------------------------------------------------------
79a1c3c: Another missed printf string (CID 715659).
660e7dd: CID 714542: Unintentional sign extension to 64 bits.
Fixed by changing type of val from u_long to u_int32_t. val only gets
passed to htonl which takes a uint32_t, so no need for it to be u_long.
be2f57f: 64-bit fixes for wb840 network driver.
3c23097: 64-bit fixes for sis900 network driver.
6314232: Added VirtualMemory preferences to image.
f3780ae: CID 715700, 715701: Fixed assumption of 4 byte pointer size.
[ Alex Smith <alex@xxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
8 files changed, 17 insertions(+), 17 deletions(-)
build/jam/Haiku64Image | 6 +++---
src/add-ons/kernel/drivers/network/sis900/sis900.c | 10 +++++-----
src/add-ons/kernel/drivers/network/wb840/wb840.c | 4 ++--
.../ipv6_datagram/ipv6_datagram.cpp | 2 +-
src/add-ons/translators/gif/SFHash.cpp | 2 +-
src/add-ons/translators/gif/SavePalette.cpp | 2 +-
src/kits/network/libbind/inet/inet_addr.c | 2 +-
src/preferences/virtualmemory/Settings.cpp | 6 +++---
############################################################################
Commit: 79a1c3c6b8fca564bb1770832d8de15921d3e0f3
Author: Alex Smith <alex@xxxxxxxxxxxxxxxx>
Date: Sat Aug 18 09:50:11 2012 UTC
Another missed printf string (CID 715659).
----------------------------------------------------------------------------
diff --git
a/src/add-ons/kernel/network/datalink_protocols/ipv6_datagram/ipv6_datagram.cpp
b/src/add-ons/kernel/network/datalink_protocols/ipv6_datagram/ipv6_datagram.cpp
index 7b0714f..e38c433 100644
---
a/src/add-ons/kernel/network/datalink_protocols/ipv6_datagram/ipv6_datagram.cpp
+++
b/src/add-ons/kernel/network/datalink_protocols/ipv6_datagram/ipv6_datagram.cpp
@@ -822,7 +822,7 @@ static void
ndp_timer(struct net_timer* timer, void* data)
{
ndp_entry* entry = (ndp_entry*)data;
- TRACE(("NDP timer %ld, entry %p!\n", entry->timer_state, entry));
+ TRACE(("NDP timer %" B_PRId32 ", entry %p!\n", entry->timer_state,
entry));
switch (entry->timer_state) {
case NDP_NO_STATE:
############################################################################
Commit: 660e7dd1c41a037fd51fa068be7091cdcb44a06e
Author: Alex Smith <alex@xxxxxxxxxxxxxxxx>
Date: Sat Aug 18 10:28:59 2012 UTC
CID 714542: Unintentional sign extension to 64 bits.
Fixed by changing type of val from u_long to u_int32_t. val only gets
passed to htonl which takes a uint32_t, so no need for it to be u_long.
----------------------------------------------------------------------------
diff --git a/src/kits/network/libbind/inet/inet_addr.c
b/src/kits/network/libbind/inet/inet_addr.c
index 73a4c5c..7366db9 100644
--- a/src/kits/network/libbind/inet/inet_addr.c
+++ b/src/kits/network/libbind/inet/inet_addr.c
@@ -107,7 +107,7 @@ inet_addr(const char *cp) {
*/
int
inet_aton(const char *cp, struct in_addr *addr) {
- u_long val;
+ u_int32_t val;
int base, n;
char c;
u_int8_t parts[4];
############################################################################
Commit: be2f57f0de2a6855db62bb713ef0a49edcc3f8d4
Author: Alex Smith <alex@xxxxxxxxxxxxxxxx>
Date: Sat Aug 18 10:47:03 2012 UTC
64-bit fixes for wb840 network driver.
----------------------------------------------------------------------------
diff --git a/build/jam/Haiku64Image b/build/jam/Haiku64Image
index 63b2b2d..f75de0d 100644
--- a/build/jam/Haiku64Image
+++ b/build/jam/Haiku64Image
@@ -75,7 +75,7 @@ SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = vesa ;
SYSTEM_ADD_ONS_DRIVERS_NET = 3com atheros813x ar81xx attansic_l1 attansic_l2
broadcom440x broadcom570x dec21xxx etherpci ipro100 ipro1000 jmicron2x0
marvell_yukon nforce pcnet pegasus rtl8139 rtl81xx sis19x syskonnect
- via_rhine
+ via_rhine wb840
;
SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata pci ps2 isa scsi config_manager
diff --git a/src/add-ons/kernel/drivers/network/wb840/wb840.c
b/src/add-ons/kernel/drivers/network/wb840/wb840.c
index d478006..4335d35 100644
--- a/src/add-ons/kernel/drivers/network/wb840/wb840.c
+++ b/src/add-ons/kernel/drivers/network/wb840/wb840.c
@@ -539,7 +539,7 @@ wb_create_rings(wb_device* device)
return device->rxArea;
for (i = 1; i < WB_RX_LIST_CNT; i++) {
- device->rxBuffer[i] = (void*)(((uint32)device->rxBuffer[0])
+ device->rxBuffer[i] = (void*)(((addr_t)device->rxBuffer[0])
+ (i * WB_BUFBYTES));
}
@@ -567,7 +567,7 @@ wb_create_rings(wb_device* device)
}
for (i = 1; i < WB_TX_LIST_CNT; i++) {
- device->txBuffer[i] = (void*)(((uint32)device->txBuffer[0])
+ device->txBuffer[i] = (void*)(((addr_t)device->txBuffer[0])
+ (i * WB_BUFBYTES));
}
############################################################################
Commit: 3c230971db0acee6542626751993e8c2de52d802
Author: Alex Smith <alex@xxxxxxxxxxxxxxxx>
Date: Sat Aug 18 10:51:17 2012 UTC
64-bit fixes for sis900 network driver.
----------------------------------------------------------------------------
diff --git a/build/jam/Haiku64Image b/build/jam/Haiku64Image
index f75de0d..02c541c 100644
--- a/build/jam/Haiku64Image
+++ b/build/jam/Haiku64Image
@@ -74,7 +74,7 @@ SYSTEM_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator
GIFTranslator
SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = vesa ;
SYSTEM_ADD_ONS_DRIVERS_NET = 3com atheros813x ar81xx attansic_l1 attansic_l2
broadcom440x broadcom570x dec21xxx etherpci ipro100 ipro1000 jmicron2x0
- marvell_yukon nforce pcnet pegasus rtl8139 rtl81xx sis19x syskonnect
+ marvell_yukon nforce pcnet pegasus rtl8139 rtl81xx sis19x sis900
syskonnect
via_rhine wb840
;
diff --git a/src/add-ons/kernel/drivers/network/sis900/sis900.c
b/src/add-ons/kernel/drivers/network/sis900/sis900.c
index 839b698..befb4d2 100644
--- a/src/add-ons/kernel/drivers/network/sis900/sis900.c
+++ b/src/add-ons/kernel/drivers/network/sis900/sis900.c
@@ -149,12 +149,12 @@ sis900_txInterrupt(struct sis_info *info)
/* Does the device generate extra interrupts? */
if (status & SiS900_DESCR_OWN) {
- struct buffer_desc *descriptor = (void
*)read32(info->registers + SiS900_MAC_Tx_DESCR);
+ uint32 descriptor = read32(info->registers +
SiS900_MAC_Tx_DESCR);
int16 that;
for (that = 0;
that < NUM_Tx_DESCR
&&
physicalAddress(&info->txDescriptor[that],
- sizeof(struct buffer_desc)) !=
(addr_t)descriptor;
+ sizeof(struct buffer_desc)) !=
descriptor;
that++) {
}
if (that == NUM_Tx_DESCR)
@@ -172,7 +172,7 @@ sis900_txInterrupt(struct sis_info *info)
if (status & (SiS900_DESCR_Tx_ABORT | SiS900_DESCR_Tx_UNDERRUN
| SiS900_DESCR_Tx_OOW_COLLISION)) {
- dprintf("tx error: %lx\n", status);
+ dprintf("tx error: %" B_PRIx32 "\n", status);
} else
info->txDescriptor[info->txInterruptIndex].status = 0;
@@ -740,7 +740,7 @@ sis900_createRings(struct sis_info *info)
// initialize transmit buffer descriptors
for (i = 1; i < NUM_Tx_DESCR; i++)
- info->txBuffer[i] = (void *)(((uint32)info->txBuffer[0]) + (i *
BUFFER_SIZE));
+ info->txBuffer[i] = (void *)(((addr_t)info->txBuffer[0]) + (i *
BUFFER_SIZE));
for (i = 0; i < NUM_Tx_DESCR; i++) {
info->txDescriptor[i].status = 0;
@@ -765,7 +765,7 @@ sis900_createRings(struct sis_info *info)
// initialize receive buffer descriptors
for (i = 1; i < NUM_Rx_DESCR; i++)
- info->rxBuffer[i] = (void *)(((uint32)info->rxBuffer[0]) + (i *
BUFFER_SIZE));
+ info->rxBuffer[i] = (void *)(((addr_t)info->rxBuffer[0]) + (i *
BUFFER_SIZE));
for (i = 0; i < NUM_Rx_DESCR; i++) {
info->rxDescriptor[i].status = MAX_FRAME_SIZE;
############################################################################
Commit: 6314232f4525b70a69d931c16817bbb61ce6bf0f
Author: Alex Smith <alex@xxxxxxxxxxxxxxxx>
Date: Sat Aug 18 11:12:36 2012 UTC
Added VirtualMemory preferences to image.
----------------------------------------------------------------------------
diff --git a/build/jam/Haiku64Image b/build/jam/Haiku64Image
index 02c541c..8a847e8 100644
--- a/build/jam/Haiku64Image
+++ b/build/jam/Haiku64Image
@@ -39,7 +39,7 @@ SYSTEM_APPS = AboutSystem DriveSetup Installer Terminal ;
SYSTEM_PREFERENCES = Appearance Backgrounds <preference>Deskbar FileTypes
Keyboard Keymap Locale Mouse Network Notifications Screen Time Touchpad
- <preference>Tracker
+ <preference>Tracker VirtualMemory
;
SYSTEM_DEMOS = ;
diff --git a/src/preferences/virtualmemory/Settings.cpp
b/src/preferences/virtualmemory/Settings.cpp
index 4706248..ad6ac3c 100644
--- a/src/preferences/virtualmemory/Settings.cpp
+++ b/src/preferences/virtualmemory/Settings.cpp
@@ -203,11 +203,11 @@ Settings::_WriteSwapSettings()
SwapVolume().GetName(volumeName);
else if (fBadVolName)
strcpy(volumeName, fBadVolName);
- snprintf(buffer, sizeof(buffer), "vm %s\nswap_size %Ld\nswap_volume
%s\n",
- SwapEnabled() ? "on" : "off", SwapSize(),
+ snprintf(buffer, sizeof(buffer), "vm %s\nswap_size %" B_PRIdOFF "\n"
+ "swap_volume %s\n", SwapEnabled() ? "on" : "off", SwapSize(),
volumeName[0] ? volumeName : NULL);
#else
- snprintf(buffer, sizeof(buffer), "vm %s\nswap_size %Ld\n",
+ snprintf(buffer, sizeof(buffer), "vm %s\nswap_size %" B_PRIdOFF "\n",
fSwapEnabled ? "on" : "off", fSwapSize);
#endif
############################################################################
Commit: f3780ae8b2dcd5ae3b30bb9c4ffc36cbac58f3fe
Author: Alex Smith <alex@xxxxxxxxxxxxxxxx>
Date: Sat Aug 18 11:24:09 2012 UTC
CID 715700, 715701: Fixed assumption of 4 byte pointer size.
----------------------------------------------------------------------------
diff --git a/src/add-ons/translators/gif/SFHash.cpp
b/src/add-ons/translators/gif/SFHash.cpp
index 005c156..e2a4586 100644
--- a/src/add-ons/translators/gif/SFHash.cpp
+++ b/src/add-ons/translators/gif/SFHash.cpp
@@ -23,7 +23,7 @@ SFHash::SFHash(int size) {
fatalerror = false;
this->size = size;
iterate_pos = iterate_depth = 0;
- main_array = (HashItem **)malloc(this->size * 4);
+ main_array = (HashItem **)malloc(this->size * sizeof(HashItem *));
if (main_array == NULL) {
fatalerror = true;
diff --git a/src/add-ons/translators/gif/SavePalette.cpp
b/src/add-ons/translators/gif/SavePalette.cpp
index 82ab952..eb1ffb1 100644
--- a/src/add-ons/translators/gif/SavePalette.cpp
+++ b/src/add-ons/translators/gif/SavePalette.cpp
@@ -324,7 +324,7 @@ SavePalette::SavePalette(BBitmap *bitmap, int32
maxSizeInBits)
fSizeInBits++;
fSize = 1 << fSizeInBits;
- ColorItem **topcolors = (ColorItem **)malloc(fSize * 4);
+ ColorItem **topcolors = (ColorItem **)malloc(fSize * sizeof(ColorItem *));
if (topcolors == NULL) {
if (debug) printf("Out of memory in SavePalette(BBitmap *)\n");
fFatalError = true;
Other related posts:
- » [haiku-commits] BRANCH xyzzy-github.x86_64 - src/add-ons/kernel/drivers/network/sis900 src/preferences/virtualmemory src/add-ons/translators/gif src/add-ons/kernel/drivers/network/wb840 build/jam - xyzzy-github . x86_64
