Changes in uspace/drv/ohci/root_hub.c [be11749:f35b294] in mainline

File:

• uspace/drv/ohci/root_hub.c (modified) (9 diffs)

uspace/drv/ohci/root_hub.c

@@ -198 +198 @@
 static int process_ctrl_request(rh_t *instance, usb_transfer_batch_t *request);
 
-static int process_interrupt(rh_t *instance, usb_transfer_batch_t * request,
-    void * change_buffer, size_t buffe_size);
-
-static bool is_zeros(void * buffer, size_t size);
+
 
 
@@ -208 +205 @@
  * @return Error code.
  */
-int rh_init(rh_t *instance, ohci_regs_t *regs) {
+int rh_init(rh_t *instance, ddf_dev_t *dev, ohci_regs_t *regs) {
         assert(instance);
+        //instance->address = -1;
         instance->registers = regs;
-        instance->port_count =
-            (instance->registers->rh_desc_a >> RHDA_NDS_SHIFT) & RHDA_NDS_MASK;
+        instance->device = dev;
+        instance->port_count = instance->registers->rh_desc_a & 0xff;
         rh_init_descriptors(instance);
         // set port power mode to no-power-switching
-        instance->registers->rh_desc_a |= RHDA_NPS_FLAG;
-        instance->unfinished_interrupt_transfer = NULL;
+        instance->registers->rh_desc_a =
+                instance->registers->rh_desc_a | (1<<9);
+
         usb_log_info("OHCI root hub with %d ports.\n", instance->port_count);
+
+        //start generic usb hub driver
+
+        /* TODO: implement */
         return EOK;
 }
@@ -233 +236 @@
         assert(request);
         int opResult;
-        if (request->ep->transfer_type == USB_TRANSFER_CONTROL) {
+        if (request->transfer_type == USB_TRANSFER_CONTROL) {
                 usb_log_info("Root hub got CONTROL packet\n");
                 opResult = process_ctrl_request(instance, request);
-                usb_transfer_batch_finish_error(request, opResult);
-        } else if (request->ep->transfer_type == USB_TRANSFER_INTERRUPT) {
+        } else if (request->transfer_type == USB_TRANSFER_INTERRUPT) {
                 usb_log_info("Root hub got INTERRUPT packet\n");
                 void * buffer;
-                size_t buffer_size;
                 create_interrupt_mask(instance, &buffer,
-                        &buffer_size);
-                if(is_zeros(buffer,buffer_size)){
-                        usb_log_debug("no changes..");
-                        instance->unfinished_interrupt_transfer=
-                            request;
-                        //will be finished later
-                }else{
-                        usb_log_debug("processing changes..");
-                        process_interrupt(instance, request,
-                            buffer, buffer_size);
-                }
-                free(buffer);
+                        &(request->transfered_size));
+                memcpy(request->transport_buffer, buffer,
+                        request->transfered_size);
                 opResult = EOK;
         } else {
                 opResult = EINVAL;
-                usb_transfer_batch_finish_error(request, opResult);
-        }
+        }
+        usb_transfer_batch_finish_error(request, opResult);
         return EOK;
 }
@@ -266 +258 @@
 
 void rh_interrupt(rh_t *instance) {
-        //usb_log_info("Whoa whoa wait, I`m not supposed to receive any "
-        //      "interrupts, am I?\n");
-        if(!instance->unfinished_interrupt_transfer){
-                return;
-        }
-        size_t size;
-        void * buffer;
-        create_interrupt_mask(instance, &buffer,
-                        &size);
-        process_interrupt(instance,instance->unfinished_interrupt_transfer,
-            buffer,size);
-        free(buffer);
+        usb_log_info("Whoa whoa wait, I`m not supposed to receive any "
+                "interrupts, am I?\n");
+        /* TODO: implement? */
 }
 /*----------------------------------------------------------------------------*/
@@ -390 +373 @@
         if (port < 1 || port > instance->port_count)
                 return EINVAL;
-        uint32_t * uint32_buffer = (uint32_t*) request->data_buffer;
+        uint32_t * uint32_buffer = (uint32_t*) request->transport_buffer;
         request->transfered_size = 4;
         uint32_buffer[0] = instance->registers->rh_port_status[port - 1];
@@ -416 +399 @@
 static int process_get_hub_status_request(rh_t *instance,
         usb_transfer_batch_t * request) {
-        uint32_t * uint32_buffer = (uint32_t*) request->data_buffer;
+        uint32_t * uint32_buffer = (uint32_t*) request->transport_buffer;
         request->transfered_size = 4;
         //bits, 0,1,16,17
@@ -566 +549 @@
         }
         request->transfered_size = size;
-        memcpy(request->data_buffer, result_descriptor, size);
+        memcpy(request->transport_buffer, result_descriptor, size);
         if (del)
                 free(result_descriptor);
@@ -587 +570 @@
         if (request->buffer_size != 1)
                 return EINVAL;
-        request->data_buffer[0] = 1;
+        request->transport_buffer[0] = 1;
         request->transfered_size = 1;
         return EOK;
@@ -882 +865 @@
         return opResult;
 }
-/*----------------------------------------------------------------------------*/
-
-/**
- * process hanging interrupt request
- *
- * If an interrupt transfer has been received and there was no change,
- * the driver stores the transfer information and waits for change to occcur.
- * This routine is called when that happens and it finalizes the interrupt
- * transfer.
- *
- * @param instance hub instance
- * @param request batch request to be processed
- * @param change_buffer chages on hub
- * @param buffer_size size of change buffer
- *
- * @return
- */
-static int process_interrupt(rh_t *instance, usb_transfer_batch_t * request,
-    void * change_buffer, size_t buffe_size){
-        create_interrupt_mask(instance, &change_buffer,
-            &(request->transfered_size));
-        memcpy(request->data_buffer, change_buffer,request->transfered_size);
-        instance->unfinished_interrupt_transfer = NULL;
-        usb_transfer_batch_finish_error(request, EOK);
-        return EOK;
-}
-
-/*----------------------------------------------------------------------------*/
-
-/**
- * return whether the buffer is full of zeros
- *
- * Convenience function.
- * @param buffer
- * @param size
- * @return
- */
-static bool is_zeros(void * buffer, size_t size){
-        if(!buffer) return true;
-        if(!size) return true;
-        size_t i;
-        for(i=0;i<size;++i){
-                if(((char*)buffer)[i])
-                        return false;
-        }
-        return true;
-}
 
 /**