Changeset 89e54124 in mainline

Timestamp:

2012-03-15T12:03:13Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

698cb1cc

Parents:

145d16f8

Message:

ohci: Rename and cleanup pci_* functions and files.

They are not pci specific. Cleanup includes.

Location:

uspace/drv/bus/usb/ohci

Files:

• Makefile (modified) (1 diff)
• ohci.c (modified) (3 diffs)
• res.c (moved) (moved from uspace/drv/bus/usb/ohci/pci.c ) (4 diffs)
• res.h (moved) (moved from uspace/drv/bus/usb/ohci/pci.h ) (1 diff)

uspace/drv/bus/usb/ohci/Makefile

@@ -50 +50 @@
         ohci_batch.c \
         ohci_endpoint.c \
-        pci.c \
+        res.c \
         root_hub.c \
         hw_struct/endpoint_descriptor.c \

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

@@ -42 +42 @@
 
 #include "ohci.h"
-#include "pci.h"
+#include "res.h"
 #include "hc.h"
 
@@ -180 +180 @@
         int irq = 0;
 
-        ret = pci_get_my_registers(device, &reg_base, &reg_size, &irq);
+        ret = get_my_registers(device, &reg_base, &reg_size, &irq);
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to get register memory addresses for %" PRIun ": %s.\n",
@@ -211 +211 @@
         /* Try to enable interrupts */
         bool interrupts = false;
-        ret = pci_enable_interrupts(device);
+        ret = enable_interrupts(device);
         if (ret != EOK) {
                 usb_log_warning("Failed to enable interrupts: %s."

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

@@ -38 +38 @@
 #include <errno.h>
 #include <assert.h>
-#include <as.h>
 #include <devman.h>
-#include <ddi.h>
-#include <libarch/ddi.h>
 #include <device/hw_res_parsed.h>
 
 #include <usb/debug.h>
-#include <pci_dev_iface.h>
 
-#include "pci.h"
+#include "res.h"
 
 /** Get address of registers and IRQ for given device.
@@ -57 +53 @@
  * @return Error code.
  */
-int pci_get_my_registers(ddf_dev_t *dev,
+int get_my_registers(const ddf_dev_t *dev,
     uintptr_t *mem_reg_address, size_t *mem_reg_size, int *irq_no)
 {
@@ -98 +94 @@
  * @return Error code.
  */
-int pci_enable_interrupts(ddf_dev_t *device)
+int enable_interrupts(const ddf_dev_t *device)
 {
         async_sess_t *parent_sess =
@@ -106 +102 @@
                 return ENOMEM;
         
-        bool enabled = hw_res_enable_interrupt(parent_sess);
+        const bool enabled = hw_res_enable_interrupt(parent_sess);
         async_hangup(parent_sess);
         

uspace/drv/bus/usb/ohci/res.h

@@ -32 +32 @@
  * PCI related functions needed by OHCI driver.
  */
-#ifndef DRV_OHCI_PCI_H
-#define DRV_OHCI_PCI_H
+#ifndef DRV_OHCI_RES_H
+#define DRV_OHCI_RES_H
 
 #include <ddf/driver.h>
 
-int pci_get_my_registers(ddf_dev_t *, uintptr_t *, size_t *, int *);
-int pci_enable_interrupts(ddf_dev_t *);
-int pci_disable_legacy(ddf_dev_t *);
+int get_my_registers(const ddf_dev_t *, uintptr_t *, size_t *, int *);
+int enable_interrupts(const ddf_dev_t *);
 
 #endif