Changeset 25458

Timestamp:

05/11/08 13:55:12 (6 days ago)

Author:

mmlr

Message:

* Added support for device state change notifications and implemented the
  ETHER_GET_LINK_STATE and ETHER_SET_LINK_STATE_SEM to provide this
  information and notification.
* Don't try to clear an endpoint halt in case of a B_CANCELED status in the
  callbacks as this is triggered by explicitly canceling transfers when the
  device is closed/removed.
* Renamed the semaphore members to *Sem to distinguish them better.
* Some minor other cleanup and some added comments.

Files:

• haiku/trunk/src/add-ons/kernel/drivers/network/usb_ecm/Driver.h (modified) (1 diff)
• haiku/trunk/src/add-ons/kernel/drivers/network/usb_ecm/ECMDevice.cpp (modified) (13 diffs)
• haiku/trunk/src/add-ons/kernel/drivers/network/usb_ecm/ECMDevice.h (modified) (3 diffs)

haiku/trunk/src/add-ons/kernel/drivers/network/usb_ecm/Driver.h

@@ -36 +36 @@
-} _PACKED ethernet_functional_descriptor;
-
+/* notification definitions */
+#define CDC_NOTIFY_NETWORK_CONNECTION           0x00
+#define CDC_NOTIFY_CONNECTION_SPEED_CHANGE      0x2a
+
+typedef struct cdc_notification_s {
+        uint8   request_type;
+        uint8   notification_code;
+        uint16  value;
+        uint16  index;
+        uint16  data_length;
+        uint8   data[0];
+} _PACKED cdc_notification;
+
+typedef struct cdc_connection_speed_s {
+        uint32  upstream_speed; /* in bits/s */
+        uint32  downstream_speed; /* in bits/s */
+} _PACKED cdc_connection_speed;
+
-extern usb_module_info *gUSBModule;
-

haiku/trunk/src/add-ons/kernel/drivers/network/usb_ecm/ECMDevice.cpp

@@ -5 +5 @@
-*/
-#include <ether_driver.h>
+#include <net/if_media.h>
-#include <string.h>
-#include <stdlib.h>
@@ -21 +22 @@
-                fMACAddressIndex(0),
-                fMaxSegmentSize(0),
-Control
+Notify
-                fReadEndpoint(0),
-
+
+
+
+
+
+
+
+
+
-{
-        const usb_device_descriptor *deviceDescriptor
@@ -51 +60 @@
-                        // try to find and interpret the union and ethernet functional
-                        // descriptors
+                        foundUnionDescriptor = foundEthernetDescriptor = false;
-                        for (size_t j = 0; j < interface->generic_count; j++) {
-                                usb_generic_descriptor *generic = &interface->generic[j]->generic;
@@ -104 +114 @@
-
-        fControlInterfaceIndex = controlIndex;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if (dataIndex >= config->interface_count) {
@@ -127 +153 @@
-
-        fDataInterfaceIndex = dataIndex;
-
-
+Sem
+Sem
-                TRACE_ALWAYS("failed to create read notify sem\n");
-                return;
-        }
-
-
-
+Sem
+Sem
-                TRACE_ALWAYS("failed to create write notify sem\n");
-                delete_sem(fNotifyRead);
-                return;
-        }
@@ -146 +171 @@
-ECMDevice::~ECMDevice()
-{
-
-
+
+
+
+
+
+
+
-}
-
@@ -245 +275 @@
-        }
-
-
+Sem
-        if (result < B_OK) {
-                *numBytes = 0;
@@ -251 +281 @@
-        }
-
-
+ && fStatusRead != B_CANCELED
-                TRACE_ALWAYS("device status error 0x%08lx\n", fStatusRead);
-                result = gUSBModule->clear_feature(fReadEndpoint,
@@ -282 +312 @@
-        }
-
-
+Sem
-        if (result < B_OK) {
-                *numBytes = 0;
@@ -288 +318 @@
-        }
-
-
+ && fStatusWrite != B_CANCELED
-                TRACE_ALWAYS("device status error 0x%08lx\n", fStatusWrite);
-                result = gUSBModule->clear_feature(fWriteEndpoint,
@@ -319 +349 @@
-                        return B_OK;
-
+#if HAIKU_TARGET_PLATFORM_HAIKU
+                case ETHER_SET_LINK_STATE_SEM:
+                        fLinkStateChangeSem = *(sem_id *)buffer;
+                        return B_OK;
+
+                case ETHER_GET_LINK_STATE:
+                {
+                        ether_link_state *state = (ether_link_state *)buffer;
+                        state->media = IFM_ETHER | IFM_FULL_DUPLEX
+                                | (fHasConnection ? IFM_ACTIVE : 0);
+                        state->quality = 1000;
+                        state->speed = fDownstreamSpeed / 1000;
+                        return B_OK;
+                }
+#endif
+
-                default:
-                        TRACE_ALWAYS("unsupported ioctl %lu\n", op);
@@ -368 +414 @@
-        device->fActualLengthRead = actualLength;
-        device->fStatusRead = status;
-
+Sem
-}
-
@@ -379 +425 @@
-        device->fActualLengthWrite = actualLength;
-        device->fStatusWrite = status;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

haiku/trunk/src/add-ons/kernel/drivers/network/usb_ecm/ECMDevice.h

@@ -34 +34 @@
-static  void                            _WriteCallback(void *cookie, int32 status,
-                                                                void *data, uint32 actualLength);
+static  void                            _NotifyCallback(void *cookie, int32 status,
+                                                                void *data, uint32 actualLength);
-
-                status_t                        _ReadMACAddress();
-
+                // state tracking
-                status_t                        fStatus;
-                bool                            fOpen;
@@ -42 +45 @@
-                usb_device                      fDevice;
-
-
-
+
-                uint8                           fControlInterfaceIndex;
-                uint8                           fDataInterfaceIndex;
@@ -49 +51 @@
-                uint16                          fMaxSegmentSize;
-
-
+
+
-                usb_pipe                        fReadEndpoint;
-                usb_pipe                        fWriteEndpoint;
-
+                // data stores for async usb transfers
-                uint32                          fActualLengthRead;
-                uint32                          fActualLengthWrite;
-                int32                           fStatusRead;
-                int32                           fStatusWrite;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-};
-