Changeset 00aece0 in mainline for uspace/lib/c/include/device/pci.h

Timestamp:

2012-02-18T16:47:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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.

File:

• uspace/lib/c/include/device/pci.h (moved) (moved from uspace/lib/c/include/ipc/fb.h ) (3 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2011 Jiri Michalec
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libcipc
+/** @addtogroup libc
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef LIBC_FB_H_
-#define LIBC_FB_H_
+#ifndef LIBC_DEVICE_PCI_H_
+#define LIBC_DEVICE_PCI_H_
 
-#include <ipc/common.h>
+#include <async.h>
+
+#define PCI_DEVICE_ID  0x02
 
 typedef enum {
-        FB_PUTCHAR = IPC_FIRST_USER_METHOD,
-        FB_CLEAR,
-        FB_GET_CSIZE,
-        FB_GET_COLOR_CAP,
-        FB_CURSOR_VISIBILITY,
-        FB_CURSOR_GOTO,
-        FB_SCROLL,
-        FB_VIEWPORT_SWITCH,
-        FB_VIEWPORT_CREATE,
-        FB_VIEWPORT_DELETE,
-        FB_SET_STYLE,
-        FB_SET_COLOR,
-        FB_SET_RGB_COLOR,
-        FB_GET_RESOLUTION,
-        FB_DRAW_TEXT_DATA,
-        FB_FLUSH,
-        FB_DRAW_IMGMAP,
-        FB_PREPARE_SHM,
-        FB_DROP_SHM,
-        FB_SHM2IMGMAP,
-        FB_VP_DRAW_IMGMAP,
-        FB_VP2IMGMAP,
-        FB_DROP_IMGMAP,
-        FB_ANIM_CREATE,
-        FB_ANIM_DROP,
-        FB_ANIM_ADDIMGMAP,
-        FB_ANIM_CHGVP,
-        FB_ANIM_START,
-        FB_ANIM_STOP,
-        FB_POINTER_MOVE,
-        FB_SCREEN_YIELD,
-        FB_SCREEN_RECLAIM
-} fb_request_t;
+        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;
 
-enum {
-        FB_CCAP_NONE = 0,
-        FB_CCAP_STYLE,
-        FB_CCAP_INDEXED,
-        FB_CCAP_RGB
-};
+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