File 0002-icE1usb-update-ice1usb_proto.h-to-current-... of Package dahdi-linux

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-icE1usb-update-ice1usb_proto.h-to-current-master.patch of Package dahdi-linux (Revision 260c6a11481b69c00d0bac35f8575074)

Currently displaying revision 260c6a11481b69c00d0bac35f8575074 , Show latest

From 000632cfb973f45b289a59fc7e30abdaa5fdc5ba Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@osmocom.org>
Date: Fri, 31 Dec 2021 19:37:32 +0100
Subject: [PATCH 2/6] icE1usb: update ice1usb_proto.h to current master

Copy from firmware source code repo at
https://git.osmocom.org/osmo-e1-hardware/tree/firmware/ice40-riscv/icE1usb/ice1usb_proto.h
as of d376b2e852fbf26a60ac4d6f66e54bb85f0b7204
---
 drivers/dahdi/icE1usb/icE1usb.c       |  2 +-
 drivers/dahdi/icE1usb/ice1usb_proto.h | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/drivers/dahdi/icE1usb/icE1usb.c b/drivers/dahdi/icE1usb/icE1usb.c
index f854527..2871039 100644
--- a/drivers/dahdi/icE1usb/icE1usb.c
+++ b/drivers/dahdi/icE1usb/icE1usb.c
@@ -451,7 +451,7 @@ static void ice1usb_irq_complete(struct urb *urb)
 		const struct ice1usb_irq_err *err;
 		irq = (struct ice1usb_irq *) urb->transfer_buffer;
 		switch (irq->type) {
-		case ICE1USB_IRQQ_T_ERRCNT:
+		case ICE1USB_IRQ_T_ERRCNT:
 			err = &irq->u.errors;
 			ieu_dbg(ieu, "IRQ: crc=%u, align=%u, ovfl=%u, unfl=%u, flags=%x",
 				le16_to_cpu(err->crc), le16_to_cpu(err->align),
diff --git a/drivers/dahdi/icE1usb/ice1usb_proto.h b/drivers/dahdi/icE1usb/ice1usb_proto.h
index 5f5f31c..71f7236 100644
--- a/drivers/dahdi/icE1usb/ice1usb_proto.h
+++ b/drivers/dahdi/icE1usb/ice1usb_proto.h
@@ -1,7 +1,14 @@
-#pragma once
+/*
+ * ice1usb_proto.h
+ *
+ * Copyright (C) 2020  Harald Welte <laforge@osmocom.org>
+ * SPDX-License-Identifier: MIT
+ *
+ * Header file describing the USB protocol between the icE1usb firmware and the host
+ * software (currently really only osmo-e1d)
+ */
 
-/* Header file describing the USB protocol between the icE1usb firmware and the host
- * software (currently really only osmo-e1d) */
+#pragma once
 
 /***********************************************************************
  * Control Endpoint / Device Requests
@@ -75,12 +82,12 @@ struct ice1usb_rx_config {
  ***********************************************************************/
 
 enum ice1usb_irq_type {
-	ICE1USB_IRQQ_T_ERRCNT		= 1,
+	ICE1USB_IRQ_T_ERRCNT		= 1,
 };
 
 /* Ensue ro keep those in sync with e1.h */
 #define ICE1USB_ERR_F_ALIGN_ERR	0x01
-#define ICE1USB_ERR_F_TICK_ERR	0x02
+#define ICE1USB_ERR_F_LOS	0x02
 
 struct ice1usb_irq_err {
 	/* 16-bit little-endian counters */
-- 
2.34.1

Places

File 0002-icE1usb-update-ice1usb_proto.h-to-current-master.patch of Package dahdi-linux (Revision 260c6a11481b69c00d0bac35f8575074)

Places