From 86a3b75e8a5aa3489b415e8687eb26236afab12e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Colin=20G=C3=BCnther?= Date: Tue, 1 Dec 2009 15:36:27 +0000 Subject: [PATCH] iprowifi3945 now links. Still needs to be tested as I don't own the needed hardware. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34411 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../drivers/network/wlan/iprowifi3945/Jamfile | 1 + .../drivers/network/wlan/iprowifi3945/glue.c | 55 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 src/add-ons/kernel/drivers/network/wlan/iprowifi3945/glue.c diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/Jamfile b/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/Jamfile index 9415802085..963fbc50a5 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/Jamfile +++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/Jamfile @@ -16,6 +16,7 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) dev wpi ] ; KernelAddon iprowifi3945 : if_wpi.c + glue.c : libfreebsd_wlan.a libfreebsd_network.a diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/glue.c b/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/glue.c new file mode 100644 index 0000000000..d18d0b2598 --- /dev/null +++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/glue.c @@ -0,0 +1,55 @@ +/* + * Copyright 2009, Colin Günther, coling@gmx.de. + * All Rights Reserved. Distributed under the terms of the MIT License. + */ + +#include +#include + +#include + +#include +#include + +#include + +#include +#include + + +HAIKU_FBSD_WLAN_DRIVER_GLUE(iprowifi3945, wpi, pci) +NO_HAIKU_FBSD_MII_DRIVER(); +HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES|FBSD_WLAN); +HAIKU_FIRMWARE_VERSION(2144); + + +int +HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev) +{ + struct wpi_softc* sc = (struct wpi_softc*)device_get_softc(dev); + uint32 r; + HAIKU_INTR_REGISTER_STATE; + + HAIKU_INTR_REGISTER_ENTER(); + if ((r = WPI_READ(sc, WPI_INTR)) == 0 || r == 0xffffffff) { + HAIKU_INTR_REGISTER_LEAVE(); + return 0; + } + + /* disable interrupts */ + WPI_WRITE(sc, WPI_MASK, 0); + + HAIKU_INTR_REGISTER_LEAVE(); + + return 1; +} + + +void +HAIKU_REENABLE_INTERRUPTS(device_t dev) +{ + struct wpi_softc* sc = (struct wpi_softc*)device_get_softc(dev); + + /* enable interrupts */ + WPI_WRITE(sc, WPI_MASK, WPI_INTR_MASK); +}