ALSA: hda - Add the controller helper codes to hda-core module

This patch adds the controller helper codes to hda-core library.
The I/O access ops are added to the bus ops.  The CORB/RIRB, the basic
attributes like irq# and iomap address, some locks and the list of
streams are added to the bus object, together with the stream object
and its helpers.

Currently the codes are just copied from the legacy driver, so you can
find duplicated codes in both directories.  Only constants are removed
from the original hda_controller.h.  More integration work will follow
in the later patches.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 18 insertions, 2 deletions

diff --git a/sound/hda/hdac_bus.c b/sound/hda/hdac_bus.c
index 8e262da74f6a..27c447e4fe5c 100644
--- a/sound/hda/hdac_bus.c
+++ b/sound/hda/hdac_bus.c
@@ -11,21 +11,36 @@
 
 static void process_unsol_events(struct work_struct *work);
 
+static const struct hdac_bus_ops default_ops = {
+        .command = snd_hdac_bus_send_cmd,
+        .get_response = snd_hdac_bus_get_response,
+};
+
 /**
  * snd_hdac_bus_init - initialize a HD-audio bas bus
  * @bus: the pointer to bus object
+ * @ops: bus verb operators
+ * @io_ops: lowlevel I/O operators
  *
  * Returns 0 if successful, or a negative error code.
  */
 int snd_hdac_bus_init(struct hdac_bus *bus, struct device *dev,
-                      const struct hdac_bus_ops *ops)
+                      const struct hdac_bus_ops *ops,
+                      const struct hdac_io_ops *io_ops)
 {
         memset(bus, 0, sizeof(*bus));
         bus->dev = dev;
-        bus->ops = ops;
+        if (ops)
+                bus->ops = ops;
+        else
+                bus->ops = &default_ops;
+        bus->io_ops = io_ops;
+        INIT_LIST_HEAD(&bus->stream_list);
         INIT_LIST_HEAD(&bus->codec_list);
         INIT_WORK(&bus->unsol_work, process_unsol_events);
+        spin_lock_init(&bus->reg_lock);
         mutex_init(&bus->cmd_mutex);
+        bus->irq = -1;
         return 0;
 }
 EXPORT_SYMBOL_GPL(snd_hdac_bus_init);
@@ -36,6 +51,7 @@ EXPORT_SYMBOL_GPL(snd_hdac_bus_init);
  */
 void snd_hdac_bus_exit(struct hdac_bus *bus)
 {
+        WARN_ON(!list_empty(&bus->stream_list));
         WARN_ON(!list_empty(&bus->codec_list));
         cancel_work_sync(&bus->unsol_work);
 }