Changeset db71e2a in mainline for uspace/drv/bus

Timestamp:

2013-07-24T17:42:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes.

usb hc macro changes from mainline were reverted, too many conflicts

Location:

uspace/drv/bus

Files:

• isa/isa.dev (modified) (1 diff)
• pci/pciintel/pci.c (modified) (2 diffs)
• pci/pciintel/pci.h (modified) (1 diff)
• pci/pciintel/pci_regs.h (modified) (1 diff)
• usb/ohci/hc.c (modified) (1 diff)
• usb/ohci/hw_struct/endpoint_descriptor.c (modified) (1 diff)
• usb/ohci/hw_struct/hcca.h (modified) (1 diff)
• usb/ohci/hw_struct/transfer_descriptor.c (modified) (1 diff)
• usb/uhci/uhci_batch.c (modified) (1 diff)
• usb/usbhub/port.c (modified) (1 diff)
• usb/usbmast/scsi_ms.c (modified) (1 diff)
• usb/vhc/hub/virthubops.c (modified) (1 diff)

uspace/drv/bus/isa/isa.dev

@@ -31 +31 @@
         match 100 isa/cmos-rtc
         io_range 70 2
+
+ata-c1:
+        match 100 isa/ata_bd
+        io_range 0x1f0 8
+        io_range 0x3f0 8
+
+ata-c2:
+        match 100 isa/ata_bd
+        io_range 0x170 8
+        io_range 0x370 8
+
+ata-c3:
+        match 100 isa/ata_bd
+        io_range 0x1e8 8
+        io_range 0x3e8 8
+
+ata-c4:
+        match 100 isa/ata_bd
+        io_range 0x168 8
+        io_range 0x368 8

uspace/drv/bus/pci/pciintel/pci.c

@@ -327 +327 @@
 
         /* Vendor ID & Device ID, length(incl \0) 22 */
-        rc = snprintf(match_id_str, ID_MAX_STR_LEN, "pci/ven=%04x&dev=%04x",
-            fun->vendor_id, fun->device_id);
+        rc = snprintf(match_id_str, ID_MAX_STR_LEN, "pci/ven=%04"
+            PRIx16 "&dev=%04" PRIx16, fun->vendor_id, fun->device_id);
         if (rc < 0) {
                 ddf_msg(LVL_ERROR, "Failed creating match ID str: %s",
@@ -758 +758 @@
         fun->vendor_id = pci_conf_read_16(fun, PCI_VENDOR_ID);
         fun->device_id = pci_conf_read_16(fun, PCI_DEVICE_ID);
+        
+        /* Explicitly enable PCI bus mastering */
+        fun->command = pci_conf_read_16(fun, PCI_COMMAND) |
+            PCI_COMMAND_MASTER;
+        pci_conf_write_16(fun, PCI_COMMAND, fun->command);
+        
         fun->class_code = pci_conf_read_8(fun, PCI_BASE_CLASS);
         fun->subclass_code = pci_conf_read_8(fun, PCI_SUB_CLASS);

uspace/drv/bus/pci/pciintel/pci.h

@@ -59 +59 @@
         int dev;
         int fn;
-        int vendor_id;
-        int device_id;
+        uint16_t vendor_id;
+        uint16_t device_id;
+        uint16_t command;
         uint8_t class_code;
         uint8_t subclass_code;

uspace/drv/bus/pci/pciintel/pci_regs.h

@@ -95 +95 @@
 #define PCI_BRIDGE_CTL                  0x3E
 
+/* PCI command flags */
+#define PCI_COMMAND_IO            0x001
+#define PCI_COMMAND_MEMORY        0x002
+#define PCI_COMMAND_MASTER        0x004
+#define PCI_COMMAND_SPECIAL       0x008
+#define PCI_COMMAND_INVALIDATE    0x010
+#define PCI_COMMAND_VGA_PALETTE   0x020
+#define PCI_COMMAND_PARITY        0x040
+#define PCI_COMMAND_WAIT          0x080
+#define PCI_COMMAND_SERR          0x100
+#define PCI_COMMAND_FAST_BACK     0x200
+#define PCI_COMMAND_INTX_DISABLE  0x400
+
 #endif
 

uspace/drv/bus/usb/ohci/hc.c

@@ -533 +533 @@
         assert(instance);
 
-        bzero(&instance->rh, sizeof(instance->rh));
+        memset(&instance->rh, 0, sizeof(instance->rh));
         /* Init queues */
         const int ret = hc_init_transfer_lists(instance);

uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c

@@ -53 +53 @@
 {
         assert(instance);
-        bzero(instance, sizeof(ed_t));
+        memset(instance, 0, sizeof(ed_t));
 
         if (ep == NULL) {

uspace/drv/bus/usb/ohci/hw_struct/hcca.h

@@ -68 +68 @@
         hcca_t *hcca = memalign(256, sizeof(hcca_t));
         if (hcca)
-                bzero(hcca, sizeof(hcca_t));
+                memset(hcca, 0, sizeof(hcca_t));
         return hcca;
 }

uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.c

@@ -58 +58 @@
 {
         assert(instance);
-        bzero(instance, sizeof(td_t));
+        memset(instance, 0, sizeof(td_t));
         /* Set PID and Error code */
         OHCI_MEM32_WR(instance->status,

uspace/drv/bus/usb/uhci/uhci_batch.c

@@ -112 +112 @@
         CHECK_NULL_DISPOSE_RETURN(uhci_batch->device_buffer,
             "Failed to allocate UHCI buffer.\n");
-        bzero(uhci_batch->device_buffer, total_size);
+        memset(uhci_batch->device_buffer, 0, total_size);
 
         uhci_batch->tds = uhci_batch->device_buffer;

uspace/drv/bus/usb/usbhub/port.c

@@ -141 +141 @@
         usb_log_debug("Interrupt at port %zu\n", port->port_number);
 
-        usb_port_status_t status;
+        usb_port_status_t status = 0;
         const int opResult = get_port_status(port, &status);
         if (opResult != EOK) {

uspace/drv/bus/usb/usbmast/scsi_ms.c

@@ -167 +167 @@
          */
 
-        bzero(inq_res, sizeof(*inq_res));
+        memset(inq_res, 0, sizeof(*inq_res));
 
         inq_res->device_type = BIT_RANGE_EXTRACT(uint8_t,

uspace/drv/bus/usb/vhc/hub/virthubops.c

@@ -299 +299 @@
     size_t *act_size)
 {
-        int rc;
+        int rc = ENOTSUP;
         size_t port = request->index - 1;
         usb_hub_class_feature_t feature = request->value;