Changeset 6843a9c in mainline for uspace/lib/c/include/device

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

Location:

uspace/lib/c/include/device

Files:

• hw_res.h (modified) (3 diffs)
• hw_res_parsed.h (modified) (2 diffs)
• nic.h (modified) (3 diffs)
• pci.h (moved) (moved from uspace/lib/c/include/ipc/net_net.h ) (2 diffs)

uspace/lib/c/include/device/hw_res.h

@@ -40 +40 @@
 #include <bool.h>
 
+#define DMA_MODE_ON_DEMAND  0
+#define DMA_MODE_WRITE      (1 << 2)
+#define DMA_MODE_READ       (1 << 3)
+#define DMA_MODE_AUTO       (1 << 4)
+#define DMA_MODE_DOWN       (1 << 5)
+#define DMA_MODE_SINGLE     (1 << 6)
+#define DMA_MODE_BLOCK      (1 << 7)
+
 /** HW resource provider interface */
 typedef enum {
@@ -80 +88 @@
                         int irq;
                 } interrupt;
-
+                
                 union {
-                        int dma8;
-                        int dma16;
+                        unsigned int dma8;
+                        unsigned int dma16;
                 } dma_channel;
         } res;
@@ -106 +114 @@
 extern bool hw_res_enable_interrupt(async_sess_t *);
 
-#define DMA_MODE_WRITE (1 << 2)
-#define DMA_MODE_READ (1 << 3)
-#define DMA_MODE_AUTO (1 << 4)
-#define DMA_MODE_DOWN (1 << 5)
-#define DMA_MODE_SINGLE (1 << 6)
-#define DMA_MODE_BLOCK (1 << 7)
-#define DMA_MODE_ON_DEMAND (0)
-
-extern int hw_res_dma_channel_setup(async_sess_t *,
-    unsigned, uint32_t, uint16_t, uint8_t);
+extern int hw_res_dma_channel_setup(async_sess_t *, unsigned int, uint32_t,
+    uint16_t, uint8_t);
 
 #endif

uspace/lib/c/include/device/hw_res_parsed.h

@@ -78 +78 @@
 
         /** Array of channels */
-        int *channels;
+        unsigned int *channels;
 } dma_list_t;
 
@@ -101 +101 @@
         irq_list_t irqs;
 
+        /** List of DMA channels */
+        dma_list_t dma_channels;
+        
         /** List of DMA channels */
         dma_list_t dma_channels;

uspace/lib/c/include/device/nic.h

@@ -37 +37 @@
 
 #include <async.h>
-#include <net/device.h>
-#include <net/packet.h>
-#include <ipc/services.h>
+#include <nic/nic.h>
+#include <ipc/common.h>
 
 typedef enum {
         NIC_SEND_MESSAGE = 0,
-        NIC_CONNECT_TO_NIL,
+        NIC_CALLBACK_CREATE,
         NIC_GET_STATE,
         NIC_SET_STATE,
@@ -85 +84 @@
 } nic_funcs_t;
 
-extern int nic_send_message(async_sess_t *, packet_id_t);
-extern int nic_connect_to_nil(async_sess_t *, services_t, nic_device_id_t);
+typedef enum {
+        NIC_EV_ADDR_CHANGED = IPC_FIRST_USER_METHOD,
+        NIC_EV_RECEIVED,
+        NIC_EV_DEVICE_STATE
+} nic_event_t;
+
+extern int nic_send_frame(async_sess_t *, void *, size_t);
+extern int nic_callback_create(async_sess_t *, async_client_conn_t, void *);
 extern int nic_get_state(async_sess_t *, nic_device_state_t *);
 extern int nic_set_state(async_sess_t *, nic_device_state_t);
@@ -127 +132 @@
 extern int nic_vlan_get_mask(async_sess_t *, nic_vlan_mask_t *);
 extern int nic_vlan_set_mask(async_sess_t *, const nic_vlan_mask_t *);
-extern int nic_vlan_set_tag(async_sess_t *, uint16_t, int, int);
+extern int nic_vlan_set_tag(async_sess_t *, uint16_t, bool, bool);
 
 extern int nic_wol_virtue_add(async_sess_t *, nic_wv_type_t, const void *,

uspace/lib/c/include/device/pci.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2011 Jiri Michalec
  * All rights reserved.
  *
@@ -30 +30 @@
  * @{
  */
-
 /** @file
- * Networking subsystem central module messages.
- * @see net_interface.h
  */
 
-#ifndef LIBC_NET_NET_MESSAGES_H_
-#define LIBC_NET_NET_MESSAGES_H_
+#ifndef LIBC_DEVICE_PCI_H_
+#define LIBC_DEVICE_PCI_H_
 
-#include <ipc/net.h>
+#include <async.h>
 
-/** Networking subsystem central module messages. */
+#define PCI_DEVICE_ID  0x02
+
 typedef enum {
-        /** Return general configuration
-         * @see net_get_conf_req()
-         */
-        NET_NET_GET_CONF = NET_FIRST,
-        /** Return device specific configuration
-         * @see net_get_device_conf_req()
-         */
-        NET_NET_GET_DEVICE_CONF,
-        /** Return number of mastered devices */
-        NET_NET_GET_DEVICES_COUNT,
-        /** Return names and device IDs of all devices */
-        NET_NET_GET_DEVICES,
-        /** Notify the networking service about a ready device */
-        NET_NET_DRIVER_READY
-} net_messages;
+        IPC_M_CONFIG_SPACE_READ_8,
+        IPC_M_CONFIG_SPACE_READ_16,
+        IPC_M_CONFIG_SPACE_READ_32,
+        
+        IPC_M_CONFIG_SPACE_WRITE_8,
+        IPC_M_CONFIG_SPACE_WRITE_16,
+        IPC_M_CONFIG_SPACE_WRITE_32
+} pci_dev_iface_funcs_t;
+
+extern int pci_config_space_read_8(async_sess_t *, uint32_t, uint8_t *);
+extern int pci_config_space_read_16(async_sess_t *, uint32_t, uint16_t *);
+extern int pci_config_space_read_32(async_sess_t *, uint32_t, uint32_t *);
+
+extern int pci_config_space_write_8(async_sess_t *, uint32_t, uint8_t);
+extern int pci_config_space_write_16(async_sess_t *, uint32_t, uint16_t);
+extern int pci_config_space_write_32(async_sess_t *, uint32_t, uint32_t);
 
 #endif