Changeset 432a269 in mainline for uspace/srv/hid/fb/ctl/serial.h

Timestamp:

2011-09-16T21:13:57Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3a11f17

Parents:

c0e53ff (diff), fd07e526 (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/srv/hid/fb/ctl/serial.h (moved) (moved from uspace/srv/hid/fb/msim.h ) (2 diffs)

uspace/srv/hid/fb/ctl/serial.h

@@ -28 +28 @@
  */
 
-/** @addtogroup msimfb
- * @brief       HelenOS MSIM text console.
- * @ingroup fbs
- * @{
- */ 
 /** @file
  */
 
-#ifndef FB_MSIM_H_
-#define FB_MSIM_H_
+#ifndef FB_CTL_SERIAL_H_
+#define FB_CTL_SERIAL_H_
 
-extern int msim_init(void);
+#include "../proto/vt100.h"
+
+extern int serial_init(vt100_putchar_t, vt100_control_puts_t);
 
 #endif
@@ -45 +42 @@
 /** @}
  */
-