hrev56210 adds 2 changesets to branch 'master'
old head: b071913066147f9ad821481679559bddbb40e835
new head: 4b6af34c0693f7784d55665f97f8904d1a012f0d
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=4b6af34c0693+%5Eb07191306614
----------------------------------------------------------------------------
8e059bfa6308: ralinkwifi (ral): Upgrade to FreeBSD 13.1
One new device ID.
4b6af34c0693: kernel: Move aligned_alloc to heap.cpp alongside calloc.
It is independent of whatever heap implementation is actually in use,
so it belongs in here (even if this file is probably not the right
place for such functions in the first place.)
This allows the kernel to be built once again with things other than
the default slab heap.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
12 files changed, 33 insertions(+), 40 deletions(-)
.../drivers/network/wlan/ralinkwifi/dev/ral/if_ral_pci.c | 9 +++++----
.../drivers/network/wlan/ralinkwifi/dev/ral/rt2560.c | 6 +++---
.../drivers/network/wlan/ralinkwifi/dev/ral/rt2560reg.h | 3 +--
.../drivers/network/wlan/ralinkwifi/dev/ral/rt2560var.h | 2 +-
.../drivers/network/wlan/ralinkwifi/dev/ral/rt2661.c | 6 +++---
.../drivers/network/wlan/ralinkwifi/dev/ral/rt2661reg.h | 3 +--
.../drivers/network/wlan/ralinkwifi/dev/ral/rt2661var.h | 4 ++--
.../drivers/network/wlan/ralinkwifi/dev/ral/rt2860.c | 12 +++++-------
.../drivers/network/wlan/ralinkwifi/dev/ral/rt2860reg.h | 6 +-----
.../drivers/network/wlan/ralinkwifi/dev/ral/rt2860var.h | 2 +-
src/system/kernel/heap.cpp | 10 ++++++++++
src/system/kernel/slab/allocator.cpp | 10 ----------
############################################################################
Commit: 8e059bfa63088eb890ade57eb8ca08e3f50e97ce
URL: https://git.haiku-os.org/haiku/commit/?id=8e059bfa6308
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Tue Jun 21 21:34:52 2022 UTC
ralinkwifi (ral): Upgrade to FreeBSD 13.1
One new device ID.
----------------------------------------------------------------------------
diff --git
a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/if_ral_pci.c
b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/if_ral_pci.c
index b41c1afdbf..e1a89bde27 100644
--- a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/if_ral_pci.c
+++ b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/if_ral_pci.c
@@ -16,7 +16,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.0/sys/dev/ral/if_ral_pci.c 338951 2018-09-26
19:41:00Z imp $");
+__FBSDID("$FreeBSD$");
/*
* PCI/Cardbus front-end for the Ralink RT2560/RT2561/RT2561S/RT2661 driver.
@@ -100,6 +100,7 @@ static const struct ral_pci_ident ral_pci_ids[] = {
{ 0x1814, 0x5390, "Ralink Technology RT5390" },
{ 0x1814, 0x5392, "Ralink Technology RT5392" },
{ 0x1814, 0x539a, "Ralink Technology RT5390" },
+ { 0x1814, 0x539b, "Ralink Technology RT5390" },
{ 0x1814, 0x539f, "Ralink Technology RT5390" },
{ 0x1a3b, 0x1059, "AWT RT2890" },
{ 0, 0, NULL }
@@ -230,7 +231,7 @@ ral_pci_attach(device_t dev)
sc->sc_st = rman_get_bustag(psc->mem);
sc->sc_sh = rman_get_bushandle(psc->mem);
sc->sc_invalid = 1;
-
+
rid = 0;
if (ral_msi_disable == 0) {
count = 1;
@@ -264,7 +265,7 @@ ral_pci_attach(device_t dev)
return error;
}
sc->sc_invalid = 0;
-
+
return 0;
}
@@ -273,7 +274,7 @@ ral_pci_detach(device_t dev)
{
struct ral_pci_softc *psc = device_get_softc(dev);
struct rt2560_softc *sc = &psc->u.sc_rt2560;
-
+
/* check if device was removed */
sc->sc_invalid = !bus_child_present(dev);
diff --git
a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560.c
b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560.c
index 9887c75f82..4627e53dfb 100644
--- a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560.c
+++ b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560.c
@@ -1,4 +1,4 @@
-/* $FreeBSD: releng/12.0/sys/dev/ral/rt2560.c 330688 2018-03-09 11:33:56Z
avos $ */
+/* $FreeBSD$ */
/*-
* Copyright (c) 2005, 2006
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.0/sys/dev/ral/rt2560.c 330688 2018-03-09
11:33:56Z avos $");
+__FBSDID("$FreeBSD$");
/*-
* Ralink Technology RT2560 chipset driver
@@ -342,7 +342,7 @@ rt2560_detach(void *xsc)
{
struct rt2560_softc *sc = xsc;
struct ieee80211com *ic = &sc->sc_ic;
-
+
rt2560_stop(sc);
ieee80211_ifdetach(ic);
diff --git
a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560reg.h
b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560reg.h
index 17cc4151be..c41149c991 100644
--- a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560reg.h
+++ b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560reg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD: releng/12.0/sys/dev/ral/rt2560reg.h 258780 2013-11-30
22:17:27Z eadler $ */
+/* $FreeBSD$ */
/*-
* Copyright (c) 2005, 2006
@@ -115,7 +115,6 @@
#define RT2560_SECCSR1 0x0158 /* WEP control */
#define RT2560_BBPCSR1 0x015c /* BBP TX Configuration */
-
/* possible flags for register RXCSR0 */
#define RT2560_DISABLE_RX (1 << 0)
#define RT2560_DROP_CRC_ERROR (1 << 1)
diff --git
a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560var.h
b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560var.h
index 73043524ec..51c5372aa6 100644
--- a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560var.h
+++ b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560var.h
@@ -1,4 +1,4 @@
-/* $FreeBSD: releng/12.0/sys/dev/ral/rt2560var.h 306591 2016-10-02
20:35:55Z avos $ */
+/* $FreeBSD$ */
/*-
* Copyright (c) 2005, 2006
diff --git
a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661.c
b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661.c
index f2669fbb4a..23df5d7e19 100644
--- a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661.c
+++ b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661.c
@@ -1,4 +1,4 @@
-/* $FreeBSD: releng/12.0/sys/dev/ral/rt2661.c 330688 2018-03-09 11:33:56Z
avos $ */
+/* $FreeBSD$ */
/*-
* Copyright (c) 2006
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.0/sys/dev/ral/rt2661.c 330688 2018-03-09
11:33:56Z avos $");
+__FBSDID("$FreeBSD$");
/*-
* Ralink Technology RT2561, RT2561S and RT2661 chipset driver
@@ -332,7 +332,7 @@ rt2661_detach(void *xsc)
{
struct rt2661_softc *sc = xsc;
struct ieee80211com *ic = &sc->sc_ic;
-
+
RAL_LOCK(sc);
rt2661_stop_locked(sc);
RAL_UNLOCK(sc);
diff --git
a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661reg.h
b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661reg.h
index 70ba439216..53f9bcde6d 100644
--- a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661reg.h
+++ b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661reg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD: releng/12.0/sys/dev/ral/rt2661reg.h 258780 2013-11-30
22:17:27Z eadler $ */
+/* $FreeBSD$ */
/*-
* Copyright (c) 2006
@@ -119,7 +119,6 @@
#define RT2661_IO_CNTL_CSR 0x3498
#define RT2661_MCU_CODE_BASE 0x4000
-
/* possible flags for register HOST_CMD_CSR */
#define RT2661_KICK_CMD (1 << 7)
/* Host to MCU (8051) command identifiers */
diff --git
a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661var.h
b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661var.h
index 33d55cb9a8..9871bd9454 100644
--- a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661var.h
+++ b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661var.h
@@ -1,4 +1,4 @@
-/* $FreeBSD: releng/12.0/sys/dev/ral/rt2661var.h 306591 2016-10-02
20:35:55Z avos $ */
+/* $FreeBSD$ */
/*-
* Copyright (c) 2005
@@ -114,7 +114,7 @@ struct rt2661_softc {
* The same in both up to here
* ------------------------------------------------
*/
-
+
int sc_flags;
#define RAL_FW_LOADED 0x1
#define RAL_INPUT_RUNNING 0x2
diff --git
a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2860.c
b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2860.c
index 09e344f4e7..869bbc544a 100644
--- a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2860.c
+++ b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2860.c
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.0/sys/dev/ral/rt2860.c 327479 2018-01-02
00:07:28Z adrian $");
+__FBSDID("$FreeBSD$");
/*-
* Ralink Technology RT2860/RT3090/RT3390/RT3562/RT5390/RT5392 chipset driver
@@ -504,7 +504,6 @@ rt2860_dma_map_addr(void *arg, bus_dma_segment_t *segs, int
nseg, int error)
*(bus_addr_t *)arg = segs[0].ds_addr;
}
-
static int
rt2860_alloc_tx_ring(struct rt2860_softc *sc, struct rt2860_tx_ring *ring)
{
@@ -1092,9 +1091,8 @@ rt2860_drain_stats_fifo(struct rt2860_softc *sc)
DPRINTFN(4, ("tx stat 0x%08x\n", stat));
wcid = (stat >> RT2860_TXQ_WCID_SHIFT) & 0xff;
- if (wcid == 0xFF)
+ if (wcid > RT2860_WCID_MAX)
continue;
-
ni = sc->wcid2ni[wcid];
/* if no ACK was requested, no feedback is available */
@@ -2225,7 +2223,7 @@ static void
rt2860_enable_mrr(struct rt2860_softc *sc)
{
#define CCK(mcs) (mcs)
-#define OFDM(mcs) (1 << 3 | (mcs))
+#define OFDM(mcs) (1U << 3 | (mcs))
RAL_WRITE(sc, RT2860_LG_FBK_CFG0,
OFDM(6) << 28 | /* 54->48 */
OFDM(5) << 24 | /* 48->36 */
@@ -2593,7 +2591,7 @@ rt5390_set_chan(struct rt2860_softc *sc, u_int chan)
rf = MIN(rf, 0x5f);
if (tmp != rf)
rt2860_mcu_cmd(sc, 0x74, (tmp << 8 ) | rf, 0);
-
+
if (sc->mac_ver == 0x5390) {
if (chan <= 4)
rf = 0x73;
@@ -3330,7 +3328,7 @@ b4inc(uint32_t b32, int8_t delta)
b4 = 0;
else if (b4 > 0xf)
b4 = 0xf;
- b32 = b32 >> 4 | b4 << 28;
+ b32 = b32 >> 4 | (uint32_t)b4 << 28;
}
return b32;
}
diff --git
a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2860reg.h
b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2860reg.h
index 4d5ecd22d5..52fe14096f 100644
--- a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2860reg.h
+++ b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2860reg.h
@@ -15,7 +15,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $OpenBSD: rt2860reg.h,v 1.30 2010/05/10 18:17:10 damien Exp $
- * $FreeBSD: releng/12.0/sys/dev/ral/rt2860reg.h 301575 2016-06-08 02:37:23Z
kevlo $
+ * $FreeBSD$
*/
#define RT2860_NOISE_FLOOR -95
@@ -210,7 +210,6 @@
#define RT2860_H2M_BBPAGENT 0x7028
#define RT2860_BCN_BASE(vap) (0x7800 + (vap) * 512)
-
/* possible flags for RT2860_PCI_CFG */
#define RT2860_PCI_CFG_USB (1 << 17)
#define RT2860_PCI_CFG_PCI (1 << 16)
@@ -699,13 +698,11 @@
#define RT2860_H2M_BUSY (1 << 24)
#define RT2860_TOKEN_NO_INTR 0xff
-
/* possible flags for MCU command RT2860_MCU_CMD_LEDS */
#define RT2860_LED_RADIO (1 << 13)
#define RT2860_LED_LINK_2GHZ (1 << 14)
#define RT2860_LED_LINK_5GHZ (1 << 15)
-
/* possible flags for RT3020 RF register 1 */
#define RT3070_RF_BLOCK (1 << 0)
#define RT3070_PLL_PD (1 << 1)
@@ -897,7 +894,6 @@ struct rt2860_rxwi {
uint16_t reserved2;
} __packed;
-
/* first DMA segment contains TXWI + 802.11 header + 32-bit padding */
#define RT2860_TXWI_DMASZ \
(sizeof (struct rt2860_txwi) + \
diff --git
a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2860var.h
b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2860var.h
index 7c8dd84c0d..73daf8b5ab 100644
--- a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2860var.h
+++ b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2860var.h
@@ -15,7 +15,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $OpenBSD: rt2860var.h,v 1.20 2010/09/07 16:21:42 deraadt Exp $
- * $FreeBSD: releng/12.0/sys/dev/ral/rt2860var.h 306591 2016-10-02 20:35:55Z
avos $
+ * $FreeBSD$
*/
#define RT2860_TX_RING_COUNT 64
############################################################################
Revision: hrev56210
Commit: 4b6af34c0693f7784d55665f97f8904d1a012f0d
URL: https://git.haiku-os.org/haiku/commit/?id=4b6af34c0693
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Wed Jun 22 02:59:57 2022 UTC
kernel: Move aligned_alloc to heap.cpp alongside calloc.
It is independent of whatever heap implementation is actually in use,
so it belongs in here (even if this file is probably not the right
place for such functions in the first place.)
This allows the kernel to be built once again with things other than
the default slab heap.
----------------------------------------------------------------------------
diff --git a/src/system/kernel/heap.cpp b/src/system/kernel/heap.cpp
index abd9bbdbd9..7036574cce 100644
--- a/src/system/kernel/heap.cpp
+++ b/src/system/kernel/heap.cpp
@@ -2493,6 +2493,16 @@ calloc(size_t numElements, size_t size)
}
+void *
+aligned_alloc(size_t alignment, size_t size)
+{
+ if ((size % alignment) != 0)
+ return NULL;
+
+ return memalign(alignment, size);
+}
+
+
void
deferred_free(void *block)
{
diff --git a/src/system/kernel/slab/allocator.cpp
b/src/system/kernel/slab/allocator.cpp
index f9f1456076..5141439e42 100644
--- a/src/system/kernel/slab/allocator.cpp
+++ b/src/system/kernel/slab/allocator.cpp
@@ -229,16 +229,6 @@ posix_memalign(void** _pointer, size_t alignment, size_t
size)
}
-void *
-aligned_alloc(size_t alignment, size_t size)
-{
- if ((size % alignment) != 0)
- return NULL;
-
- return memalign(alignment, size);
-}
-
-
void
free_etc(void *address, uint32 flags)
{
