Changeset 8e7c9fe in mainline for uspace/lib/c/arch/ia32/include/libarch/fibril_context.ag

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/lib/c/arch/ia32/include/libarch/fibril_context.ag (moved) (moved from uspace/app/pcc/cc/ccom/mkext/Makefile ) (2 diffs)

uspace/lib/c/arch/ia32/include/libarch/fibril_context.ag

@@ -1 @@
-#
-# Copyright (c) 2011 Jiri Zarevucky
+# Copyright (c) 2014 Jakub Jermar 
 # All rights reserved.
 #
@@ -27 +26 @@
 #
 
-USPACE_PREFIX = ../../../../..
-MIPDIR = ../../../mip
-MDIR = ../../../arch/$(PLATFORM)
-OSDIR = ../../../os/helenos
-EXTRA_CFLAGS = -I$(MIPDIR) -I$(MDIR) -I$(OSDIR) -I. -w
-DEFS = -DGCC_COMPAT -DPCC_DEBUG -DMKEXT -Dmach_$(PLATFORM) -D__helenos__
-BINARY = cc_mkext
+{
+        name : context,
 
-POSIX_COMPAT = y
+        includes : [
+                {
+                        include : <sys/types.h>
+                }
+        ],
 
-PRE_DEPEND = mkext.c table.c common.c
-EXTRA_CLEAN = mkext.c table.c common.c
+        members : [
+                #
+                # We include only registers that must be preserved
+                # during function call.
+                #
 
-# FIXME: external.{c,h} must be generated for each target system
+                {
+                        name : sp,
+                        type : uint32_t
+                },
+                {
+                        name : pc,
+                        type : uint32_t
+                },
 
-SOURCES = \
-        mkext.c \
-        table.c \
-        common.c
+                {
+                        name : ebx,
+                        type : uint32_t
+                },
+                {
+                        name : esi,
+                        type : uint32_t
+                },
+                {
+                        name : edi,
+                        type : uint32_t
+                },
+                {
+                        name : ebp,
+                        type : uint32_t
+                },
 
-include $(USPACE_PREFIX)/Makefile.common
-
-mkext.c: $(MIPDIR)/mkext.c
-        ln -s -f $^ $@
-
-table.c: $(MDIR)/table.c
-        ln -s -f $^ $@
-
-common.c: $(MIPDIR)/common.c
-        ln -s -f $^ $@
-
+                {
+                        name : tls,
+                        type : uint32_t
+                }
+        ]
+}