Changeset ca2d142 in mainline for uspace/srv/net/messages.h

Timestamp:

2010-02-18T10:00:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e326edc

Parents:

b8da2a3 (diff), 91478aa (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 from the networking branch.

File:

• uspace/srv/net/messages.h (modified) (1 diff)

uspace/srv/net/messages.h

@@ -459 +459 @@
 }
 
-/** Returns the device packet dimensions for sending.
- *  @param[in] phone The service module phone.
- *  @param[in] message The service specific message.
- *  @param[in] device_id The device identifier.
- *  @param[out] addr_len The minimum reserved address length.
- *  @param[out] prefix The minimum reserved prefix size.
- *  @param[out] content The maximum content size.
- *  @param[out] suffix The minimum reserved suffix size.
- *  @returns EOK on success.
+/** Returns the device packet dimension for sending.
+ *  @param[in] phone The service module phone.
+ *  @param[in] message The service specific message.
+ *  @param[in] device_id The device identifier.
+ *  @param[out] packet_dimension The packet dimension.
+ *  @returns EOK on success.
+ *  @returns EBADMEM if the packet_dimension parameter is NULL.
  *  @returns Other error codes as defined for the specific service message.
  */
-static inline int       generic_packet_size_req( int phone, int message, device_id_t device_id, size_t * addr_len, size_t * prefix, size_t * content, size_t * suffix ){
-        return ( int ) async_req_1_4( phone, ( ipcarg_t ) message, ( ipcarg_t ) device_id, ( ipcarg_t * ) addr_len, ( ipcarg_t * ) prefix, ( ipcarg_t * ) content, ( ipcarg_t * ) suffix );
+static inline int       generic_packet_size_req( int phone, int message, device_id_t device_id, packet_dimension_ref packet_dimension ){
+        ipcarg_t        result;
+        ipcarg_t        prefix;
+        ipcarg_t        content;
+        ipcarg_t        suffix;
+        ipcarg_t        addr_len;
+
+        if( ! packet_dimension ) return EBADMEM;
+        result = async_req_1_4( phone, ( ipcarg_t ) message, ( ipcarg_t ) device_id, & addr_len, & prefix, & content, & suffix );
+        packet_dimension->prefix = ( size_t ) prefix;
+        packet_dimension->content = ( size_t ) content;
+        packet_dimension->suffix = ( size_t ) suffix;
+        packet_dimension->addr_len = ( size_t ) addr_len;
+        return ( int ) result;
 }