Changeset fdbc3ff in mainline for uspace/app

Timestamp:

2010-11-19T23:50:06Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

46d4d9f

Parents:

b4c9c61 (diff), a9c6b966 (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.

Location:

uspace/app

Files:

• bdsh/cmds/modules/bdd/bdd.c (modified) (1 diff)
• getterm/getterm.c (modified) (2 diffs)
• init/init.c (modified) (2 diffs)
• mkfat/mkfat.c (modified) (3 diffs)
• netecho/print_error.h (modified) (2 diffs)
• netstart/Makefile (deleted)
• netstart/netstart.c (deleted)
• nettest1/nettest.c (modified) (6 diffs)
• test_serial/test_serial.c (modified) (1 diff)

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

@@ -68 +68 @@
         unsigned int argc;
         unsigned int i, j;
-        dev_handle_t handle;
+        devmap_handle_t handle;
         uint8_t *blk;
         size_t size, bytes, rows;

uspace/app/getterm/getterm.c

@@ -84 +84 @@
         bool print_wmsg;
 
-        ++argv; --argc;
+        argv++;
+        argc--;
         if (argc < 1) {
                 usage();
@@ -92 +93 @@
         if (str_cmp(*argv, "-w") == 0) {
                 print_wmsg = true;
-                ++argv; --argc;
+                argv++;
+                argc--;
         } else {
                 print_wmsg = false;

uspace/app/init/init.c

@@ -185 +185 @@
         
         /* Wait for the input device to be ready */
-        dev_handle_t handle;
+        devmap_handle_t handle;
         rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
@@ -210 +210 @@
         
         /* Wait for the terminal device to be ready */
-        dev_handle_t handle;
+        devmap_handle_t handle;
         rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
         if (rc != EOK) {

uspace/app/mkfat/mkfat.c

@@ -85 +85 @@
     struct fat_params *par);
 static int fat_blocks_write(struct fat_params const *par,
-    dev_handle_t handle);
+    devmap_handle_t handle);
 static void fat_bootsec_create(struct fat_params const *par, struct fat_bs *bs);
 
@@ -95 +95 @@
         int rc;
         char *dev_path;
-        dev_handle_t handle;
+        devmap_handle_t handle;
         size_t block_size;
         char *endptr;
@@ -234 +234 @@
 
 /** Create file system with the given parameters. */
-static int fat_blocks_write(struct fat_params const *par, dev_handle_t handle)
+static int fat_blocks_write(struct fat_params const *par, devmap_handle_t handle)
 {
         aoff64_t addr;

uspace/app/netecho/print_error.h

@@ -43 +43 @@
  *
  * @param[in] error_code The error code.
- * @returns A value indicating whether the error code may be an ICMP error code.
+ * @return A value indicating whether the error code may be an ICMP error code.
  */
 #define IS_ICMP_ERROR(error_code)       ((error_code) > 0)
@@ -50 +50 @@
  *
  * @param[in] error_code The error code.
- * @returns A value indicating whether the error code may be a socket error code.
+ * @return A value indicating whether the error code may be a socket error code.
  */
 #define IS_SOCKET_ERROR(error_code)     ((error_code) < 0)

uspace/app/nettest1/nettest.c

@@ -49 +49 @@
  * @param[in] family The socket address family.
  * @param[in] type The socket type.
- * @returns EOK on success.
- * @returns Other error codes as defined for the socket() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the socket() function.
  */
 int sockets_create(int verbose, int *socket_ids, int sockets, int family, sock_type_t type)
@@ -80 +80 @@
  * @param[in] socket_ids A field of stored socket identifiers.
  * @param[in] sockets The number of sockets in the field. Should be at most the size of the field.
- * @returns EOK on success.
- * @returns Other error codes as defined for the closesocket() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the closesocket() function.
  */
 int sockets_close(int verbose, int *socket_ids, int sockets)
@@ -114 +114 @@
  * @param[in] address The destination host address to connect to.
  * @param[in] addrlen The length of the destination address in bytes.
- * @returns EOK on success.
- * @returns Other error codes as defined for the connect() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the connect() function.
  */
 int sockets_connect(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t addrlen)
@@ -150 +150 @@
  * @param[in] size The data size in bytes.
  * @param[in] messages The number of datagrams per socket to be sent.
- * @returns EOK on success.
- * @returns Other error codes as defined for the sendto() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the sendto() function.
  */
 int sockets_sendto(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t addrlen, char *data, int size, int messages)
@@ -190 +190 @@
  * @param[in] size The maximum data size in bytes.
  * @param[in] messages The number of datagrams per socket to be received.
- * @returns EOK on success.
- * @returns Other error codes as defined for the recvfrom() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the recvfrom() function.
  */
 int sockets_recvfrom(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t *addrlen, char *data, int size, int messages)
@@ -232 +232 @@
  * @param[in] size The data size in bytes.
  * @param[in] messages The number of datagrams per socket to be received.
- * @returns EOK on success.
- * @returns Other error codes as defined for the recvfrom() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the recvfrom() function.
  */
 int sockets_sendto_recvfrom(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t *addrlen, char *data, int size, int messages)

uspace/app/test_serial/test_serial.c

@@ -69 +69 @@
         int res;
         res = devman_get_phone(DEVMAN_CLIENT, IPC_FLAG_BLOCKING);
-        device_handle_t handle;
+        devman_handle_t handle;
         
         res = devman_device_get_handle("/hw/pci0/00:01.0/com1", &handle,