github-actions[bot]
2 years ago
committed by
GitHub
commit
fa46b52651
@ -0,0 +1,41 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchFromGitHub |
||||
, python-magic |
||||
, pythonOlder |
||||
, requests |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "pycketcasts"; |
||||
version = "1.0.1"; |
||||
format = "setuptools"; |
||||
|
||||
disabled = pythonOlder "3.7"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "nwithan8"; |
||||
repo = pname; |
||||
rev = version; |
||||
hash = "sha256-O4j89fE7fYPthhCH8b2gGskkelEA4mU6GvSbKIl+4Mk="; |
||||
}; |
||||
|
||||
propagatedBuildInputs = [ |
||||
python-magic |
||||
requests |
||||
]; |
||||
|
||||
# Module has no tests |
||||
doCheck = false; |
||||
|
||||
pythonImportsCheck = [ |
||||
"pycketcasts" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "Module to interact with PocketCast's unofficial API"; |
||||
homepage = "https://github.com/nwithan8/pycketcasts"; |
||||
license = licenses.gpl3Only; |
||||
maintainers = with maintainers; [ fab ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,38 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchPypi |
||||
, pyserial |
||||
, pythonOlder |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "ultraheat-api"; |
||||
version = "0.4.0"; |
||||
format = "setuptools"; |
||||
|
||||
disabled = pythonOlder "3.7"; |
||||
|
||||
src = fetchPypi { |
||||
pname = "ultraheat_api"; |
||||
inherit version; |
||||
hash = "sha256-J0mQolWdXatIG/ORTBNyo6HrAfydvYqXK7LxInQWcX0="; |
||||
}; |
||||
|
||||
propagatedBuildInputs = [ |
||||
pyserial |
||||
]; |
||||
|
||||
# Source is not tagged, only PyPI releases |
||||
doCheck = false; |
||||
|
||||
pythonImportsCheck = [ |
||||
"ultraheat_api" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "Module for working with data from Landis+Gyr Ultraheat heat meter unit"; |
||||
homepage = "https://github.com/vpathuis/uh50"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ fab ]; |
||||
}; |
||||
} |
||||
@ -1,27 +0,0 @@ |
||||
{ lib, buildGoPackage, fetchFromGitHub }: |
||||
|
||||
buildGoPackage { |
||||
pname = "manul"; |
||||
version = "unstable-2016-09-30"; |
||||
|
||||
goPackagePath = "github.com/kovetskiy/manul"; |
||||
excludedPackages = "tests"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "kovetskiy"; |
||||
repo = "manul"; |
||||
rev = "7bddb5404b9ecc66fd28075bb899c2d6dc7a1c51"; |
||||
sha256 = "06kglxdgj1dfpc9bdnvhsh8z0c1pdbmwmfx4km01wpppzk06dnvm"; |
||||
}; |
||||
|
||||
deleteVendor = true; |
||||
goDeps = ./deps.nix; |
||||
|
||||
meta = with lib; { |
||||
description = "The madness vendoring utility for Golang programs"; |
||||
homepage = "https://github.com/kovetskiy/manul"; |
||||
license = licenses.mit; |
||||
platforms = platforms.unix; |
||||
maintainers = [ maintainers.mic92 ]; |
||||
}; |
||||
} |
||||
@ -1,75 +0,0 @@ |
||||
# This file was generated by go2nix. |
||||
[ |
||||
{ |
||||
goPackagePath = "github.com/PuerkitoBio/goquery"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://github.com/PuerkitoBio/goquery"; |
||||
rev = "3cb3b8656883c2cc3deb9c643d93ea6e5157e425"; |
||||
sha256 = "0qhyssjwv98jncsiph95iz77sygkismvpprsalqi3xm3k50xi6r7"; |
||||
}; |
||||
} |
||||
{ |
||||
goPackagePath = "github.com/andybalholm/cascadia"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://github.com/andybalholm/cascadia"; |
||||
rev = "349dd0209470eabd9514242c688c403c0926d266"; |
||||
sha256 = "12ikz849vkdb3dsdn6mdpkihvm0hbmkplyi0qdcm7s4ib4n003b1"; |
||||
}; |
||||
} |
||||
{ |
||||
goPackagePath = "github.com/kovetskiy/godocs"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://github.com/kovetskiy/godocs"; |
||||
rev = "2d9428f80f3442e07f67daf7ba378cd0ff6cfe24"; |
||||
sha256 = "128dlvxqk31crzl9p3ps0nir724cjzxv4lxpgdvsir0wvfp8f83j"; |
||||
}; |
||||
} |
||||
{ |
||||
goPackagePath = "github.com/reconquest/executil-go"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://github.com/reconquest/executil-go"; |
||||
rev = "e72bce509b1a5e89ab21f29c92830d4304620765"; |
||||
sha256 = "06z05hl4bym5agv0h1vgksj0mx0l4987ganwqcfb153w7pclvan3"; |
||||
}; |
||||
} |
||||
{ |
||||
goPackagePath = "github.com/reconquest/hierr-go"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://github.com/reconquest/hierr-go"; |
||||
rev = "bbf802f3f943e7b6a364a485ccf90807f3bfcc0e"; |
||||
sha256 = "1v3fssw881vcawc2abvp8abwb7705yzxrb0khbzmn8qvdpqwh7hl"; |
||||
}; |
||||
} |
||||
{ |
||||
goPackagePath = "github.com/reconquest/ser-go"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://github.com/reconquest/ser-go"; |
||||
rev = "47f084a1e4a5433ac3d6ab6cfe8c1e30028a4d76"; |
||||
sha256 = "1hgafiqc3mlazs2zg4rqjm4sasy2gjrjl64cy8mmlg5cayvbj4hq"; |
||||
}; |
||||
} |
||||
{ |
||||
goPackagePath = "golang.org/x/crypto"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://go.googlesource.com/crypto"; |
||||
rev = "c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6"; |
||||
sha256 = "1y2bbghi594m8p4pcm9pwrzql06179xj6zvhaghwcc6y0l48rbgp"; |
||||
}; |
||||
} |
||||
{ |
||||
goPackagePath = "golang.org/x/net"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://go.googlesource.com/net"; |
||||
rev = "6acef71eb69611914f7a30939ea9f6e194c78172"; |
||||
sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc"; |
||||
}; |
||||
} |
||||
] |
||||
@ -1,39 +1,80 @@ |
||||
diff -u -r a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
|
||||
--- a/src/wl/sys/wl_linux.c 2022-03-23 00:35:42.930416350 +0000
|
||||
+++ b/src/wl/sys/wl_linux.c 2022-03-23 00:40:12.903771013 +0000
|
||||
@@ -2980,7 +2980,11 @@
|
||||
From 31b7849092c43805c7fbaf7518b99874aa1b310c Mon Sep 17 00:00:00 2001
|
||||
From: Joan Bruguera <joanbrugueram@gmail.com>
|
||||
Date: Wed, 12 Jan 2022 20:49:20 +0100
|
||||
Subject: [PATCH] Tentative fix for broadcom-wl 6.30.223.271 driver for Linux 5.17-rc1
|
||||
|
||||
Set netdev->dev_addr through dev_addr_mod + PDE_DATA fix
|
||||
|
||||
Since Linux 5.17 netdev->dev_addr is const and must be changed through
|
||||
dev_addr_mod, otherwise a warning is logged in dmesg and bad things may happen.
|
||||
|
||||
NB: The #if is not wrong, dev_addr_mod is defined since Linux 5.15-rc1
|
||||
|
||||
Plus a trivial fix for PDE_DATA.
|
||||
|
||||
Applies on top of all the patches applied to broadcom-wl-dkms 6.30.223.271-28 on Arch Linux.
|
||||
|
||||
See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=adeef3e32146a8d2a73c399dc6f5d76a449131b1
|
||||
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=359745d78351c6f5442435f81549f0207ece28aa
|
||||
---
|
||||
src/wl/sys/wl_linux.c | 16 +++++++++++++---
|
||||
1 file changed, 13 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
|
||||
index e491df7..e4614fb 100644
|
||||
--- a/src/wl/sys/wl_linux.c
|
||||
+++ b/src/wl/sys/wl_linux.c
|
||||
@@ -93,6 +93,10 @@ struct iw_statistics *wl_get_wireless_stats(struct net_device *dev);
|
||||
|
||||
#include <wlc_wowl.h>
|
||||
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
|
||||
+#define PDE_DATA pde_data
|
||||
+#endif
|
||||
+
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
||||
static void wl_timer(struct timer_list *tl);
|
||||
#else
|
||||
@@ -490,6 +494,12 @@ wl_if_setup(struct net_device *dev)
|
||||
#endif
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
|
||||
+static inline void eth_hw_addr_set(struct net_device *dev, const void *addr) {
|
||||
+ memcpy(dev->dev_addr, addr, ETHER_ADDR_LEN);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
static wl_info_t *
|
||||
wl_attach(uint16 vendor, uint16 device, ulong regs,
|
||||
uint bustype, void *btparam, uint irq, uchar* bar1_addr, uint32 bar1_size)
|
||||
@@ -634,7 +644,7 @@ wl_attach(uint16 vendor, uint16 device, ulong regs,
|
||||
WL_ERROR(("wl%d: Error setting MAC ADDRESS\n", unit));
|
||||
}
|
||||
#endif
|
||||
- bcopy(&wl->pub->cur_etheraddr, dev->dev_addr, ETHER_ADDR_LEN);
|
||||
+ eth_hw_addr_set(dev, wl->pub->cur_etheraddr.octet);
|
||||
|
||||
online_cpus = 1;
|
||||
|
||||
@@ -1835,7 +1845,7 @@ wl_set_mac_address(struct net_device *dev, void *addr)
|
||||
|
||||
WL_LOCK(wl);
|
||||
|
||||
- bcopy(sa->sa_data, dev->dev_addr, ETHER_ADDR_LEN);
|
||||
+ eth_hw_addr_set(dev, sa->sa_data);
|
||||
err = wlc_iovar_op(wl->wlc, "cur_etheraddr", NULL, 0, sa->sa_data, ETHER_ADDR_LEN,
|
||||
IOV_SET, (WL_DEV_IF(dev))->wlcif);
|
||||
WL_UNLOCK(wl);
|
||||
@@ -3010,7 +3020,7 @@ _wl_add_monitor_if(wl_task_t *task)
|
||||
else
|
||||
dev->type = ARPHRD_IEEE80211_RADIOTAP;
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
|
||||
bcopy(wl->dev->dev_addr, dev->dev_addr, ETHER_ADDR_LEN);
|
||||
+#else
|
||||
+ eth_hw_addr_set(wl->dev, dev->dev_addr);
|
||||
+#endif
|
||||
- bcopy(wl->dev->dev_addr, dev->dev_addr, ETHER_ADDR_LEN);
|
||||
+ eth_hw_addr_set(dev, wl->dev->dev_addr);
|
||||
|
||||
#if defined(WL_USE_NETDEV_OPS)
|
||||
dev->netdev_ops = &wl_netdev_monitor_ops;
|
||||
@@ -3261,7 +3265,11 @@
|
||||
static ssize_t
|
||||
wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *offp)
|
||||
{
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
|
||||
wl_info_t * wl = PDE_DATA(file_inode(filp));
|
||||
+#else
|
||||
+ wl_info_t * wl = pde_data(file_inode(filp));
|
||||
+#endif
|
||||
#endif
|
||||
int bcmerror, len;
|
||||
int to_user = 0;
|
||||
@@ -3318,7 +3326,11 @@
|
||||
static ssize_t
|
||||
wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *offp)
|
||||
{
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
|
||||
wl_info_t * wl = PDE_DATA(file_inode(filp));
|
||||
+#else
|
||||
+ wl_info_t * wl = pde_data(file_inode(filp));
|
||||
+#endif
|
||||
#endif
|
||||
int from_user = 0;
|
||||
int bcmerror;
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
||||
@ -0,0 +1,71 @@ |
||||
diff -u -r a/src/shared/linux_osl.c b/src/shared/linux_osl.c
|
||||
--- a/src/shared/linux_osl.c 2022-05-24 20:51:15.662604980 +0000
|
||||
+++ b/src/shared/linux_osl.c 2022-05-24 21:13:38.264472425 +0000
|
||||
@@ -599,6 +599,8 @@
|
||||
va = kmalloc(size, GFP_ATOMIC | __GFP_ZERO);
|
||||
if (va)
|
||||
*pap = (ulong)__virt_to_phys(va);
|
||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
|
||||
+ va = dma_alloc_coherent(&((struct pci_dev *)osh->pdev)->dev, size, (dma_addr_t*)pap, GFP_ATOMIC);
|
||||
#else
|
||||
va = pci_alloc_consistent(osh->pdev, size, (dma_addr_t*)pap);
|
||||
#endif
|
||||
@@ -612,6 +614,8 @@
|
||||
|
||||
#ifdef __ARM_ARCH_7A__
|
||||
kfree(va);
|
||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
|
||||
+ dma_free_coherent(&((struct pci_dev *)osh->pdev)->dev, size, va, (dma_addr_t)pa);
|
||||
#else
|
||||
pci_free_consistent(osh->pdev, size, va, (dma_addr_t)pa);
|
||||
#endif
|
||||
@@ -623,7 +627,11 @@
|
||||
int dir;
|
||||
|
||||
ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
|
||||
+ dir = (direction == DMA_TX)? DMA_TO_DEVICE: DMA_FROM_DEVICE;
|
||||
+#else
|
||||
dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;
|
||||
+#endif
|
||||
|
||||
#if defined(__ARM_ARCH_7A__) && defined(BCMDMASGLISTOSL)
|
||||
if (dmah != NULL) {
|
||||
@@ -641,7 +649,11 @@
|
||||
ASSERT(totsegs + nsegs <= MAX_DMA_SEGS);
|
||||
sg->page_link = 0;
|
||||
sg_set_buf(sg, PKTDATA(osh, skb), PKTLEN(osh, skb));
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
|
||||
+ dma_map_single(&((struct pci_dev *)osh->pdev)->dev, PKTDATA(osh, skb), PKTLEN(osh, skb), dir);
|
||||
+#else
|
||||
pci_map_single(osh->pdev, PKTDATA(osh, skb), PKTLEN(osh, skb), dir);
|
||||
+#endif
|
||||
}
|
||||
totsegs += nsegs;
|
||||
totlen += PKTLEN(osh, skb);
|
||||
@@ -656,7 +668,11 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
|
||||
+ return (dma_map_single(&((struct pci_dev *)osh->pdev)->dev, va, size, dir));
|
||||
+#else
|
||||
return (pci_map_single(osh->pdev, va, size, dir));
|
||||
+#endif
|
||||
}
|
||||
|
||||
void BCMFASTPATH
|
||||
@@ -665,8 +681,13 @@
|
||||
int dir;
|
||||
|
||||
ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
|
||||
+ dir = (direction == DMA_TX)? DMA_TO_DEVICE: DMA_FROM_DEVICE;
|
||||
+ dma_unmap_single(&((struct pci_dev *)osh->pdev)->dev, (uint32)pa, size, dir);
|
||||
+#else
|
||||
dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;
|
||||
pci_unmap_single(osh->pdev, (uint32)pa, size, dir);
|
||||
+#endif
|
||||
}
|
||||
|
||||
#if defined(BCMDBG_ASSERT)
|
||||
@ -0,0 +1,94 @@ |
||||
diff --git a/src/shared/linux_osl.c b/shared/linux_osl.c
|
||||
index 711b771..5a2636a 100644
|
||||
--- a/src/shared/linux_osl.c
|
||||
+++ b/src/shared/linux_osl.c
|
||||
@@ -1105,7 +1105,7 @@ osl_os_get_image_block(char *buf, int len, void *image)
|
||||
if (!image)
|
||||
return 0;
|
||||
|
||||
- rdlen = kernel_read(fp, fp->f_pos, buf, len);
|
||||
+ rdlen = kernel_read(fp, (void *)fp->f_pos, (size_t)len, (loff_t *)buf);
|
||||
if (rdlen > 0)
|
||||
fp->f_pos += rdlen;
|
||||
|
||||
diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/wl/sys/wl_cfg80211_hybrid.c
|
||||
index 41c16d8..d39d9de 100644
|
||||
--- a/src/wl/sys/wl_cfg80211_hybrid.c
|
||||
+++ b/src/wl/sys/wl_cfg80211_hybrid.c
|
||||
@@ -790,6 +790,7 @@ wl_set_auth_type(struct net_device *dev, struct cfg80211_connect_params *sme)
|
||||
break;
|
||||
case NL80211_AUTHTYPE_NETWORK_EAP:
|
||||
WL_DBG(("network eap\n"));
|
||||
+ break;
|
||||
default:
|
||||
val = 2;
|
||||
WL_ERR(("invalid auth type (%d)\n", sme->auth_type));
|
||||
@@ -2347,21 +2348,20 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
|
||||
const wl_event_msg_t *e, void *data)
|
||||
{
|
||||
struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
|
||||
+ s32 err = 0;
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
|
||||
struct cfg80211_bss *bss;
|
||||
struct wlc_ssid *ssid;
|
||||
+ struct cfg80211_roam_info roam_info;
|
||||
ssid = &wl->profile->ssid;
|
||||
bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
|
||||
ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
|
||||
- struct cfg80211_roam_info roam_info = {
|
||||
- .bss = bss,
|
||||
- .req_ie = conn_info->req_ie,
|
||||
- .req_ie_len = conn_info->req_ie_len,
|
||||
- .resp_ie = conn_info->resp_ie,
|
||||
- .resp_ie_len = conn_info->resp_ie_len,
|
||||
- };
|
||||
+ roam_info.bss = bss;
|
||||
+ roam_info.req_ie = conn_info->req_ie;
|
||||
+ roam_info.req_ie_len = conn_info->req_ie_len;
|
||||
+ roam_info.resp_ie = conn_info->resp_ie;
|
||||
+ roam_info.resp_ie_len = conn_info->resp_ie_len;
|
||||
#endif
|
||||
- s32 err = 0;
|
||||
|
||||
wl_get_assoc_ies(wl);
|
||||
memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN);
|
||||
diff --git a/src/wl/sys/wl_iw.h b/wl/sys/wl_iw.h
|
||||
index 3ab084f..471d11f 100644
|
||||
--- a/src/wl/sys/wl_iw.h
|
||||
+++ b/src/wl/sys/wl_iw.h
|
||||
@@ -70,7 +70,6 @@ struct cntry_locales_custom {
|
||||
#define WL_IW_RSSI_EXCELLENT -57
|
||||
#define WL_IW_RSSI_INVALID 0
|
||||
#define MAX_WX_STRING 80
|
||||
-#define isprint(c) bcm_isprint(c)
|
||||
#define WL_IW_SET_ACTIVE_SCAN (SIOCIWFIRSTPRIV+1)
|
||||
#define WL_IW_GET_RSSI (SIOCIWFIRSTPRIV+3)
|
||||
#define WL_IW_SET_PASSIVE_SCAN (SIOCIWFIRSTPRIV+5)
|
||||
diff --git a/src/wl/sys/wl_linux.c b/wl/sys/wl_linux.c
|
||||
index d13fb98..97ae2a6 100644
|
||||
--- a/src/wl/sys/wl_linux.c
|
||||
+++ b/src/wl/sys/wl_linux.c
|
||||
@@ -797,14 +797,15 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
pci_read_config_dword(pdev, 0x40, &val);
|
||||
if ((val & 0x0000ff00) != 0)
|
||||
pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
|
||||
- bar1_size = pci_resource_len(pdev, 2);
|
||||
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
|
||||
- bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2),
|
||||
- bar1_size);
|
||||
- #else
|
||||
- bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2),
|
||||
- bar1_size);
|
||||
- #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */
|
||||
+
|
||||
+ bar1_size = pci_resource_len(pdev, 2);
|
||||
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
|
||||
+ bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2),
|
||||
+ bar1_size);
|
||||
+ #else
|
||||
+ bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2),
|
||||
+ bar1_size);
|
||||
+ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */
|
||||
wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev,
|
||||
pdev->irq, bar1_addr, bar1_size);
|
||||
|
||||
Loading…
Reference in new issue