Changeset 9d9ffdd in mainline for uspace/lib/drv/include/pci_dev_iface.h

Timestamp:

2011-03-11T15:42:43Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

0bd4810c

Parents:

60a228f (diff), a8def7d (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 with hidd

File:

• uspace/lib/drv/include/pci_dev_iface.h (moved) (moved from uspace/lib/usb/src/hcdhubd_private.h ) (3 diffs)

uspace/lib/drv/include/pci_dev_iface.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libusb
+/** @addtogroup libdrv
+ * @addtogroup usb
  * @{
  */
 /** @file
- * @brief Common definitions for both HC driver and hub driver.
+ * @brief PCI device interface definition.
  */
-#ifndef LIBUSB_HCDHUBD_PRIVATE_H_
-#define LIBUSB_HCDHUBD_PRIVATE_H_
 
-#define USB_HUB_DEVICE_NAME "usbhub"
-#define USB_KBD_DEVICE_NAME "hid"
+#ifndef LIBDRV_PCI_DEV_IFACE_H_
+#define LIBDRV_PCI_DEV_IFACE_H_
 
-extern link_t hc_list;
-extern usb_hc_driver_t *hc_driver;
+#include "ddf/driver.h"
 
-extern usbhc_iface_t usbhc_interface;
+typedef enum {
+        IPC_M_CONFIG_SPACE_READ_8,
+        IPC_M_CONFIG_SPACE_READ_16,
+        IPC_M_CONFIG_SPACE_READ_32,
 
-usb_address_t usb_get_address_by_handle(devman_handle_t);
-int usb_add_hc_device(device_t *);
+        IPC_M_CONFIG_SPACE_WRITE_8,
+        IPC_M_CONFIG_SPACE_WRITE_16,
+        IPC_M_CONFIG_SPACE_WRITE_32
+} pci_dev_iface_funcs_t;
 
-/** lowest allowed usb address */
-extern int usb_lowest_address;
+/** PCI device communication interface. */
+typedef struct {
+        int (*config_space_read_8)(ddf_fun_t *, uint32_t address, uint8_t *data);
+        int (*config_space_read_16)(ddf_fun_t *, uint32_t address, uint16_t *data);
+        int (*config_space_read_32)(ddf_fun_t *, uint32_t address, uint32_t *data);
 
-/** highest allowed usb address */
-extern int usb_highest_address;
-
-/**
- * @brief initialize address list of given hcd
- *
- * This function should be used only for hcd initialization.
- * It creates interval list of free addresses, thus it is initialized as
- * list with one interval with whole address space. Using an address shrinks
- * the interval, freeing an address extends an interval or creates a
- * new one. 
- *
- * @param hcd
- * @return
- */
-void  usb_create_address_list(usb_hc_device_t * hcd);
-
-
-
-
+        int (*config_space_write_8)(ddf_fun_t *, uint32_t address, uint8_t data);
+        int (*config_space_write_16)(ddf_fun_t *, uint32_t address, uint16_t data);
+        int (*config_space_write_32)(ddf_fun_t *, uint32_t address, uint32_t data);
+} pci_dev_iface_t;
 
 
@@ -76 +66 @@
  * @}
  */
+