Changeset 97c7682 in mainline for uspace/app/bdsh/cmds/modules/echo/echo.c

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/app/bdsh/cmds/modules/echo/echo.c (moved) (moved from uspace/lib/net/include/protocol_map.h ) (2 diffs)

uspace/app/bdsh/cmds/modules/echo/echo.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Alexander Prutkov
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libnet
- * @{
- */
+#include <stdio.h>
+#include <stdlib.h>
+#include "config.h"
+#include "util.h"
+#include "errors.h"
+#include "entry.h"
+#include "echo.h"
+#include "cmds.h"
+#include "errno.h"
 
-/** @file
- * Internetwork layer services - network interface layer service type
- * translation.
- */
+static const char *cmdname = "echo";
 
-#ifndef LIBNET_PROTOCOL_MAP_H_
-#define LIBNET_PROTOCOL_MAP_H_
+void help_cmd_echo(unsigned int level)
+{
+        if (level == HELP_SHORT) {
+                printf("`%s' prints arguments as they are, followed by a new line.\n", cmdname);
+        } else {
+                help_cmd_echo(HELP_SHORT);
+                printf("Usage:  %s [arg ...]\n", cmdname);
+        }
 
-#include <ethernet_lsap.h>
-#include <ethernet_protocols.h>
-#include <net_hardware.h>
+        return;
+}
 
-#include <ipc/services.h>
+/* Main entry point for echo, accepts an array of arguments */
+int cmd_echo(char **argv)
+{
+        unsigned int argc;
 
-extern eth_type_t protocol_map(services_t, services_t);
-extern services_t protocol_unmap(services_t, int);
-extern eth_type_t lsap_map(eth_lsap_t);
-extern eth_lsap_t lsap_unmap(eth_type_t);
-extern hw_type_t hardware_map(services_t);
+        for (argc = 1; argv[argc] != NULL; argc ++) {
+                printf("%s ", argv[argc]);
+        }
+        printf("\n");
+        return CMD_SUCCESS;
 
-#endif
+}
 
-/** @}
- */