From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>,
Gerd Hoffmann <kraxel@redhat.com>
Cc: libvir-list@redhat.com, "Alex Bennée" <alex.bennee@linaro.org>,
qemu-arm@nongnu.org, "Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH for-5.0 1/4] hw/arm/nseries: Replace the bluetooth chardev with a "null" chardev
Date: Wed, 20 Nov 2019 10:10:11 +0100 [thread overview]
Message-ID: <20191120091014.16883-2-thuth@redhat.com> (raw)
In-Reply-To: <20191120091014.16883-1-thuth@redhat.com>
We are going to remove the bitrotten bluetooth backend, so we can
not use it in the n800 and n810 machines anymore. Replace the chardev
here with a "null" chardev and stop including the "hw/bt.h" header.
I am not aware of a full working N8x0 environment that can be used to
test these machines, but the Linux kernel from the Meego project that
can be found on http://stskeeps.subnetmask.net/meego-n8x0/ still seems
to boot as far as it did before.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/arm/nseries.c | 16 +++++++---------
qemu-doc.texi | 2 --
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index 7e361936a9..3fd196fb30 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -21,6 +21,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "cpu.h"
+#include "chardev/char.h"
#include "qemu/cutils.h"
#include "qemu/bswap.h"
#include "sysemu/reset.h"
@@ -39,7 +40,6 @@
#include "hw/qdev-properties.h"
#include "hw/block/flash.h"
#include "hw/hw.h"
-#include "hw/bt.h"
#include "hw/loader.h"
#include "hw/sysbus.h"
#include "qemu/log.h"
@@ -792,13 +792,11 @@ static void n8x0_cbus_setup(struct n800_s *s)
static void n8x0_uart_setup(struct n800_s *s)
{
- Chardev *radio = uart_hci_init();
-
- qdev_connect_gpio_out(s->mpu->gpio, N8X0_BT_RESET_GPIO,
- csrhci_pins_get(radio)[csrhci_pin_reset]);
- qdev_connect_gpio_out(s->mpu->gpio, N8X0_BT_WKUP_GPIO,
- csrhci_pins_get(radio)[csrhci_pin_wakeup]);
-
+ Chardev *radio = qemu_chr_new("bt-dummy-uart", "null", NULL);
+ /*
+ * Note: We used to connect N8X0_BT_RESET_GPIO and N8X0_BT_WKUP_GPIO
+ * here, but this code has been removed with the bluetooth backend.
+ */
omap_uart_attach(s->mpu->uart[BT_UART], radio);
}
@@ -1137,7 +1135,7 @@ static struct omap_partition_info_s {
{ 0, 0, 0, NULL }
};
-static bdaddr_t n8x0_bd_addr = {{ N8X0_BD_ADDR }};
+static uint8_t n8x0_bd_addr[6] = { N8X0_BD_ADDR };
static int n8x0_atag_setup(void *p, int model)
{
diff --git a/qemu-doc.texi b/qemu-doc.texi
index 3ddf5c0a68..ed3df01dac 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -2308,8 +2308,6 @@ Secure Digital card connected to OMAP MMC/SD host
@item
Three OMAP on-chip UARTs and on-chip STI debugging console
@item
-A Bluetooth(R) transceiver and HCI connected to an UART
-@item
Mentor Graphics "Inventra" dual-role USB controller embedded in a TI
TUSB6010 chip - only USB host mode is supported
@item
--
2.23.0
next prev parent reply other threads:[~2019-11-20 9:12 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-20 9:10 [PATCH for-5.0 0/4] Remove the deprecated bluetooth subsystem Thomas Huth
2019-11-20 9:10 ` Thomas Huth [this message]
2019-11-20 10:51 ` [PATCH for-5.0 1/4] hw/arm/nseries: Replace the bluetooth chardev with a "null" chardev Peter Maydell
2019-11-20 9:10 ` [PATCH for-5.0 2/4] hw/usb: Remove the USB bluetooth dongle device Thomas Huth
2019-11-20 9:35 ` [libvirt] " Ján Tomko
2019-11-20 9:10 ` [PATCH for-5.0 3/4] Remove the core bluetooth code Thomas Huth
2019-11-20 9:36 ` [libvirt] " Ján Tomko
2020-02-01 16:09 ` Philippe Mathieu-Daudé
2020-02-01 18:50 ` Thomas Huth
2020-02-01 18:53 ` Philippe Mathieu-Daudé
2020-02-01 18:59 ` Thomas Huth
2020-02-05 15:26 ` Paolo Bonzini
2020-02-05 17:40 ` Aleksandar Markovic
2020-02-05 17:46 ` Thomas Huth
2020-02-05 17:54 ` Daniel P. Berrangé
2020-02-05 17:51 ` Daniel P. Berrangé
2020-02-05 18:03 ` Aleksandar Markovic
2020-02-05 18:53 ` Aleksandar Markovic
2020-02-06 6:49 ` Thomas Huth
2020-02-05 19:13 ` Philippe Mathieu-Daudé
2020-02-06 9:56 ` Daniel P. Berrangé
2019-11-20 9:10 ` [PATCH for-5.0 4/4] Remove libbluetooth / bluez from the CI tests Thomas Huth
2019-11-20 9:58 ` [PATCH for-5.0 0/4] Remove the deprecated bluetooth subsystem Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191120091014.16883-2-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=kraxel@redhat.com \
--cc=libvir-list@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).