Changeset 6773ff3 in mainline for uspace/srv

Timestamp:

2012-04-23T14:57:42Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ee3b6150

Parents:

728d771 (diff), 6aae539d (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 with mainline

Location:

uspace/srv/hid

Files:

• input/port/chardev.c (modified) (1 diff)
• s3c24xx_ts/Makefile (modified) (1 diff)
• s3c24xx_ts/s3c24xx_ts.c (modified) (1 diff)

uspace/srv/hid/input/port/chardev.c

@@ -63 +63 @@
 /** List of devices to try connecting to. */
 static const char *in_devs[] = {
-        "char/s3c24ser"
+        "char/s3c24xx_uart"
 };
 

uspace/srv/hid/s3c24xx_ts/Makefile

@@ -29 +29 @@
 USPACE_PREFIX = ../../..
 
-# Need to use short name because of FAT 8+3 limit
-BINARY = s3c24ts
+BINARY = s3c24xx_ts
 
 SOURCES = \

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -52 +52 @@
 #include "s3c24xx_ts.h"
 
-#define NAME       "s3c24ser"
+#define NAME       "s3c24xx_ts"
 #define NAMESPACE  "hid"