Changeset 5828554 in mainline for kernel/arch/sparc32/include/arch/mm/as.h

Timestamp:

2014-01-19T14:37:22Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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:

• kernel/arch/sparc32/include/arch/mm/as.h (moved) (moved from uspace/lib/c/include/device/pci.h ) (3 diffs)

kernel/arch/sparc32/include/arch/mm/as.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jiri Michalec
+ * Copyright (c) 2010 Martin Decky
+ * Copyright (c) 2013 Jakub Klama
  * All rights reserved.
  *
@@ -27 +28 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup sparc32mm
  * @{
  */
@@ -33 +34 @@
  */
 
-#ifndef LIBC_DEVICE_PCI_H_
-#define LIBC_DEVICE_PCI_H_
+#ifndef KERN_sparc32_AS_H_
+#define KERN_sparc32_AS_H_
 
-#include <async.h>
+#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
 
-#define PCI_DEVICE_ID  0x02
+#define KERNEL_ADDRESS_SPACE_START_ARCH  UINT32_C(0x80000000)
+#define KERNEL_ADDRESS_SPACE_END_ARCH    UINT32_C(0xffffffff)
+#define USER_ADDRESS_SPACE_START_ARCH    UINT32_C(0x00000000)
+#define USER_ADDRESS_SPACE_END_ARCH      UINT32_C(0x7fffffff)
 
-typedef enum {
-        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;
+typedef struct {
+} as_arch_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 *);
+#include <genarch/mm/as_pt.h>
 
-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);
+#define as_constructor_arch(as, flags)  (as != as)
+#define as_destructor_arch(as)          (as != as)
+#define as_create_arch(as, flags)       (as != as)
+#define as_deinstall_arch(as)
+#define as_invalidate_translation_cache(as, page, cnt)
+
+extern uintptr_t as_context_table;
+
+extern void as_arch_init(void);
 
 #endif