Changeset 8e7c9fe in mainline for uspace/dist/src/c/demos/edit/sheet_impl.h

Timestamp:

2014-09-12T03:45:25Z (10 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/dist/src/c/demos/edit/sheet_impl.h (moved) (moved from kernel/arch/mips64/include/arch/stack.h ) (2 diffs)

uspace/dist/src/c/demos/edit/sheet_impl.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup mips64
+/** @addtogroup edit
  * @{
  */
-/** @file
+/**
+ * @file
  */
 
-#ifndef KERN_mips64_STACK_H_
-#define KERN_mips64_STACK_H_
+#ifndef SHEET_IMPL_H__
+#define SHEET_IMPL_H__
 
-#include <config.h>
+#include "sheet.h"
 
-#define MEM_STACK_SIZE  STACK_SIZE
+/** Sheet */
+struct sheet {
+        /* Note: This structure is opaque for the user. */
 
-#define STACK_ITEM_SIZE  8
-#define STACK_ALIGNMENT  8
-#define ABI_STACK_FRAME  64
+        size_t text_size;
+        size_t dbuf_size;
+        char *data;
+
+        list_t tags;
+};
 
 #endif