Skip to content

Commit 38c182e

Browse files
authored
Attempt to fix missing prototypes on bce
1 parent d910398 commit 38c182e

File tree

1 file changed

+23
-15
lines changed

1 file changed

+23
-15
lines changed

1001-Add-apple-bce-driver.patch

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 80093f92d42d77f27de6b204550baf4622070732 Mon Sep 17 00:00:00 2001
1+
From fb72b7575a091284a3e2bd0a955aa2c61a6f5bc4 Mon Sep 17 00:00:00 2001
22
From: Aditya Garg <[email protected]>
3-
Date: Tue, 12 Sep 2023 12:26:12 +0530
3+
Date: Thu, 14 Mar 2024 06:51:34 +0000
44
Subject: [PATCH] Add apple-bce driver
55

66
---
77
drivers/staging/apple-bce/Makefile | 28 +
88
drivers/staging/apple-bce/apple_bce.c | 443 ++++++++++
99
drivers/staging/apple-bce/apple_bce.h | 38 +
1010
drivers/staging/apple-bce/audio/audio.c | 711 ++++++++++++++++
11-
drivers/staging/apple-bce/audio/audio.h | 123 +++
11+
drivers/staging/apple-bce/audio/audio.h | 125 +++
1212
drivers/staging/apple-bce/audio/description.h | 42 +
1313
drivers/staging/apple-bce/audio/pcm.c | 308 +++++++
1414
drivers/staging/apple-bce/audio/pcm.h | 16 +
@@ -26,10 +26,10 @@ Subject: [PATCH] Add apple-bce driver
2626
drivers/staging/apple-bce/vhci/queue.c | 268 +++++++
2727
drivers/staging/apple-bce/vhci/queue.h | 76 ++
2828
drivers/staging/apple-bce/vhci/transfer.c | 661 +++++++++++++++
29-
drivers/staging/apple-bce/vhci/transfer.h | 71 ++
29+
drivers/staging/apple-bce/vhci/transfer.h | 73 ++
3030
drivers/staging/apple-bce/vhci/vhci.c | 759 ++++++++++++++++++
31-
drivers/staging/apple-bce/vhci/vhci.h | 48 ++
32-
25 files changed, 5629 insertions(+)
31+
drivers/staging/apple-bce/vhci/vhci.h | 52 ++
32+
25 files changed, 5637 insertions(+)
3333
create mode 100644 drivers/staging/apple-bce/Makefile
3434
create mode 100644 drivers/staging/apple-bce/apple_bce.c
3535
create mode 100644 drivers/staging/apple-bce/apple_bce.h
@@ -1303,10 +1303,10 @@ index 000000000..bd16ddd16
13031303
+MODULE_PARM_DESC(id, "ID string for Apple Internal Audio soundcard.");
13041304
diff --git a/drivers/staging/apple-bce/audio/audio.h b/drivers/staging/apple-bce/audio/audio.h
13051305
new file mode 100644
1306-
index 000000000..693006e93
1306+
index 000000000..004bc1e22
13071307
--- /dev/null
13081308
+++ b/drivers/staging/apple-bce/audio/audio.h
1309-
@@ -0,0 +1,123 @@
1309+
@@ -0,0 +1,125 @@
13101310
+#ifndef AAUDIO_H
13111311
+#define AAUDIO_H
13121312
+
@@ -1422,6 +1422,8 @@ index 000000000..693006e93
14221422
+};
14231423
+
14241424
+void aaudio_handle_notification(struct aaudio_device *a, struct aaudio_msg *msg);
1425+
+void aaudio_handle_prop_change_work(struct work_struct *ws);
1426+
+void aaudio_handle_cmd_timestamp(struct aaudio_device *a, struct aaudio_msg *msg);
14251427
+void aaudio_handle_command(struct aaudio_device *a, struct aaudio_msg *msg);
14261428
+
14271429
+int aaudio_module_init(void);
@@ -4946,10 +4948,10 @@ index 000000000..8226363d6
49464948
+}
49474949
diff --git a/drivers/staging/apple-bce/vhci/transfer.h b/drivers/staging/apple-bce/vhci/transfer.h
49484950
new file mode 100644
4949-
index 000000000..6a62a00b2
4951+
index 000000000..89ecad6bc
49504952
--- /dev/null
49514953
+++ b/drivers/staging/apple-bce/vhci/transfer.h
4952-
@@ -0,0 +1,71 @@
4954+
@@ -0,0 +1,73 @@
49534955
+#ifndef BCEDRIVER_TRANSFER_H
49544956
+#define BCEDRIVER_TRANSFER_H
49554957
+
@@ -5013,6 +5015,8 @@ index 000000000..6a62a00b2
50135015
+ struct usb_host_endpoint *endp, bce_vhci_device_t dev_addr, enum dma_data_direction dir);
50145016
+void bce_vhci_destroy_transfer_queue(struct bce_vhci *vhci, struct bce_vhci_transfer_queue *q);
50155017
+void bce_vhci_transfer_queue_event(struct bce_vhci_transfer_queue *q, struct bce_vhci_message *msg);
5018+
+int bce_vhci_transfer_queue_do_pause(struct bce_vhci_transfer_queue *q);
5019+
+int bce_vhci_transfer_queue_do_resume(struct bce_vhci_transfer_queue *q);
50165020
+int bce_vhci_transfer_queue_pause(struct bce_vhci_transfer_queue *q, enum bce_vhci_pause_source src);
50175021
+int bce_vhci_transfer_queue_resume(struct bce_vhci_transfer_queue *q, enum bce_vhci_pause_source src);
50185022
+void bce_vhci_transfer_queue_request_reset(struct bce_vhci_transfer_queue *q);
@@ -5023,7 +5027,7 @@ index 000000000..6a62a00b2
50235027
+#endif //BCEDRIVER_TRANSFER_H
50245028
diff --git a/drivers/staging/apple-bce/vhci/vhci.c b/drivers/staging/apple-bce/vhci/vhci.c
50255029
new file mode 100644
5026-
index 000000000..053a9f39e
5030+
index 000000000..eb26f5500
50275031
--- /dev/null
50285032
+++ b/drivers/staging/apple-bce/vhci/vhci.c
50295033
@@ -0,0 +1,759 @@
@@ -5269,7 +5273,7 @@ index 000000000..053a9f39e
52695273
+ return 0;
52705274
+}
52715275
+
5272-
+static int bce_vhci_address_device(struct usb_hcd *hcd, struct usb_device *udev)
5276+
+static int bce_vhci_address_device(struct usb_hcd *hcd, struct usb_device *udev, unsigned int timeout_ms) //TODO: follow timeout
52735277
+{
52745278
+ /* This is the same as enable_device, but instead in the old scheme */
52755279
+ return bce_vhci_enable_device(hcd, udev);
@@ -5788,10 +5792,10 @@ index 000000000..053a9f39e
57885792
+MODULE_PARM_DESC(vhci_port_mask, "Specifies which VHCI ports are enabled");
57895793
diff --git a/drivers/staging/apple-bce/vhci/vhci.h b/drivers/staging/apple-bce/vhci/vhci.h
57905794
new file mode 100644
5791-
index 000000000..90641d1ba
5795+
index 000000000..6c2e22622
57925796
--- /dev/null
57935797
+++ b/drivers/staging/apple-bce/vhci/vhci.h
5794-
@@ -0,0 +1,48 @@
5798+
@@ -0,0 +1,52 @@
57955799
+#ifndef BCE_VHCI_H
57965800
+#define BCE_VHCI_H
57975801
+
@@ -5838,8 +5842,12 @@ index 000000000..90641d1ba
58385842
+
58395843
+int bce_vhci_create(struct apple_bce_device *dev, struct bce_vhci *vhci);
58405844
+void bce_vhci_destroy(struct bce_vhci *vhci);
5845+
+int bce_vhci_start(struct usb_hcd *hcd);
5846+
+void bce_vhci_stop(struct usb_hcd *hcd);
5847+
+
5848+
+struct bce_vhci *bce_vhci_from_hcd(struct usb_hcd *hcd);
58415849
+
58425850
+#endif //BCE_VHCI_H
58435851
--
5844-
2.39.2
5852+
2.43.2
58455853

0 commit comments

Comments
 (0)