Changeset a81a1d09 in mainline for uspace/drv/ohci/pci.c

Timestamp:

2011-05-11T16:49:28Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

19387b61

Parents:

e1dbcbc (diff), 9212f8a (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 development/ changes

File:

• uspace/drv/ohci/pci.c (modified) (4 diffs)

uspace/drv/ohci/pci.c

@@ -47 +47 @@
 #include "pci.h"
 
-#define PAGE_SIZE_MASK 0xfffff000
-
-#define HCC_PARAMS_OFFSET 0x8
-#define HCC_PARAMS_EECP_MASK 0xff
-#define HCC_PARAMS_EECP_OFFSET 8
-
-#define CMD_OFFSET 0x0
-#define CONFIGFLAG_OFFSET 0x40
-
-#define USBCMD_RUN 1
-
-#define USBLEGSUP_OFFSET 0
-#define USBLEGSUP_BIOS_CONTROL (1 << 16)
-#define USBLEGSUP_OS_CONTROL (1 << 24)
-#define USBLEGCTLSTS_OFFSET 4
-
-#define DEFAULT_WAIT 10000
-#define WAIT_STEP 10
-
 /** Get address of registers and IRQ for given device.
  *
@@ -77 +58 @@
     uintptr_t *mem_reg_address, size_t *mem_reg_size, int *irq_no)
 {
-        assert(dev != NULL);
+        assert(dev);
+        assert(mem_reg_address);
+        assert(mem_reg_size);
+        assert(irq_no);
 
         int parent_phone = devman_parent_device_connect(dev->handle,
@@ -146 +130 @@
 int pci_enable_interrupts(ddf_dev_t *device)
 {
-        return ENOTSUP;
         int parent_phone =
             devman_parent_device_connect(device->handle, IPC_FLAG_BLOCKING);
@@ -156 +139 @@
         return enabled ? EOK : EIO;
 }
-/*----------------------------------------------------------------------------*/
-/** Implements BIOS handoff routine as decribed in OHCI spec
- *
- * @param[in] device Device asking for interrupts
- * @return Error code.
- */
-int pci_disable_legacy(ddf_dev_t *device)
-{
-        /* TODO: implement */
-        return EOK;
-}
-/*----------------------------------------------------------------------------*/
 /**
  * @}