Subversion Repositories HelenOS

Compare Revisions

No changes between revisions

Ignore whitespace Rev 4260 → Rev 4261

/branches/network/uspace/srv/net/include/nil_messages.h
0,0 → 1,114
/*
* Copyright (c) 2009 Lukas Mejdrech
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* - The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup net_nil
* @{
*/
 
/**
* @file
*/
 
#ifndef __NET_NIL_MESSAGES_H__
#define __NET_NIL_MESSAGES_H__
 
#include <async.h>
#include <errno.h>
#include <malloc.h>
 
#include <ipc/ipc.h>
 
#include "../messages.h"
 
#include "../structures/measured_strings.h"
#include "../structures/packet/packet.h"
 
#include "device.h"
 
typedef enum {
/* ( device_id, driver_service, mtu ) */
NET_NIL_DEVICE = NET_NIL_FIRST,
/* ( device_id, state ) */
NET_NIL_DEVICE_STATE,
/* ( device_id ), packet_send */
NET_NIL_RECEIVED,
/* ( device_id ), packet_send */
NET_NIL_SEND,
/* ( device_id ) -> addr, prefix, content, suffix */
NET_NIL_PACKET_SPACE,
/* ( device_id ), measured_strings_return( hardware address ) */
NET_NIL_ADDR,
/* ( device_id ), measured_strings_return( broadcast address ) */
NET_NIL_BROADCAST_ADDR,
} nil_messages;
 
#ifdef NIL_BUNDLE
 
#include "../nil/nil_wrappers.h"
 
/** Returns the protocol service message parameter.
*/
#define NIL_GET_PROTO( call ) ( services_t ) IPC_GET_ARG2( * call )
 
#define NIL_GET_MTU( call ) ( size_t ) IPC_GET_ARG2( * call )
 
#define nil_device_state_msg( nil_phone, device_id, state ) \
nil_device_state_wrapper( device_id, state )
 
#define nil_received_msg( nil_phone, device_id, packet, target ) \
( void ) nil_receive_wrapper( device_id, packet )
 
#else
 
#define nil_get_addr( nil_phone, device_id, address, data ) \
generic_get_addr( nil_phone, NET_NIL_ADDR, device_id, address, data )
 
#define nil_get_broadcast_addr( nil_phone, device_id, address, data ) \
generic_get_addr( nil_phone, NET_NIL_BROADCAST_ADDR, device_id, address, data )
 
#define nil_send_msg( nil_phone, device_id, packet, sender ) \
generic_send_msg( nil_phone, NET_NIL_SEND, device_id, packet_get_id( packet ), sender )
 
#define nil_packet_size_req( nil_phone, device_id, addr_len, prefix, content, suffix ) \
generic_packet_size_req( nil_phone, NET_NIL_PACKET_SPACE, device_id, addr_len, prefix, content, suffix )
 
#define nil_device_state_msg( nil_phone, device_id, state ) \
generic_device_state_msg( nil_phone, NET_NIL_DEVICE_STATE, device_id, state )
 
#define nil_received_msg( nil_phone, device_id, packet, target ) \
generic_received_msg( nil_phone, NET_NIL_RECEIVED, device_id, packet_get_id( packet ), target )
 
#define nil_device_req( nil_phone, device_id, mtu, netif_service ) \
generic_device_req( nil_phone, NET_NIL_DEVICE, device_id, mtu, netif_service )
 
#endif
 
#endif
 
/** @}
*/
Property changes:
Added: svn:eol-style
+native
\ No newline at end of property
/branches/network/uspace/srv/net/include/netif_messages.h
73,59 → 73,48
 
#include "../netif/netif_wrappers.h"
 
#define NETIF_GET_DEVICE( call ) ( device_id_t ) IPC_GET_ARG1( * call )
 
#define NETIF_GET_PACKET( call ) ( packet_id_t ) IPC_GET_ARG2( * call )
#define NETIF_GET_IRQ( call ) ( int ) IPC_GET_ARG2( * call )
 
#define NETIF_GET_IO( call ) ( int ) IPC_GET_ARG3( * call )
 
#define netif_get_addr( netif_phone, device_id, address, data ) \
netif_get_addr_wrapper( netif_phone, device_id, address, data )
netif_get_addr_wrapper( device_id, address, data )
 
#define netif_probe_req( netif_phone, device_id, irq, io ) \
netif_probe_wrapper( device_id, irq, io )
static inline int netif_probe_req( int netif_phone, device_id_t device_id, int irq, int io ){
return netif_probe_wrapper( device_id, irq, io );
}
 
#define netif_send_msg( netif_phone, device_id, packet ) \
netif_send_wrapper( device_id, packet )
#define netif_send_msg( netif_phone, device_id, packet, sender ) \
netif_send_wrapper( device_id, packet, sender )
 
#define netif_start_req( netif_phone, device_id ) \
netif_start_wrapper( device_id )
static inline int netif_start_req( int netif_phone, device_id_t device_id ){
return netif_start_wrapper( device_id );
}
 
#define netif_stop_req( netif_phone, device_id ) \
netif_stop_wrapper( device_id )
static inline int netif_stop_req( int netif_phone, device_id_t device_id ){
return netif_stop_wrapper( device_id );
}
 
#else
 
static inline int netif_get_addr( int netif_phone, device_id_t device_id, measured_string_ref * address, char ** data ){
aid_t message;
// ipc_call_t answer;
ipcarg_t result;
int string;
#define netif_get_addr( netif_phone, device_id, address, data ) \
generic_get_addr( netif_phone, NET_NETIF_GET_ADDR, device_id, address, data )
 
if( !( address && data )) return EBADMEM;
message = async_send_1( netif_phone, NET_NETIF_GET_ADDR, device_id, NULL /* & answer */ );
string = measured_strings_return( netif_phone, address, data, 1 );
async_wait_for( message, & result );
if(( string == EOK ) && ( result != EOK )){
free( * address );
free( * data );
}
return result;
static inline int netif_probe_req( int netif_phone, device_id_t device_id, int irq, int io ){
return async_req_3_0( netif_phone, NET_NETIF_PROBE, device_id, irq, io );
}
 
#define netif_probe_req( netif_phone, device_id, irq, io ) \
async_req_3_0( netif_phone, NET_NETIF_PROBE, device_id, irq, io )
#define netif_send_msg( netif_phone, device_id, packet, sender ) \
generic_send_msg( netif_phone, NET_NETIF_SEND, device_id, packet_get_id( packet ), sender )
 
#define netif_send_msg( netif_phone, device_id, packet ) \
async_msg_2( netif_phone, NET_NETIF_SEND, device_id, packet_get_id( packet ))
static inline int netif_start_req( int netif_phone, device_id_t device_id ){
return async_req_1_0( netif_phone, NET_NETIF_START, device_id );
}
 
#define netif_start_req( netif_phone, device_id ) \
async_req_1_0( netif_phone, NET_NETIF_START, device_id )
static inline int netif_stop_req( int netif_phone, device_id_t device_id ){
return async_req_1_0( netif_phone, NET_NETIF_STOP, device_id );
}
 
#define netif_stop_req( netif_phone, device_id ) \
async_req_1_0( netif_phone, NET_NETIF_STOP, device_id )
 
#endif
 
#endif
/branches/network/uspace/srv/net/include/protocol_map.h
108,6 → 108,7
static inline int hardware_map( services_t nil ){
switch( nil ){
case SERVICE_ETHERNET:
case SERVICE_DP8390:
return HW_ETHER;
default:
return 0;
/branches/network/uspace/srv/net/include/byteorder.h
39,6 → 39,8
 
#include <byteorder.h>
 
#include <sys/types.h>
 
#ifdef ARCH_IS_BIG_ENDIAN
 
// Already in the network byte order.
75,7 → 77,7
* @param number The number in the host byte order to be converted.
* @returns The number in the network byte order.
*/
#define htons( number ) uint16_t_byteorder_swap( number )
#define htons( number ) uint16_t_byteorder_swap(( uint16_t )( number ))
 
/** Converts the given long number ( 32 bit ) from the host byte order to the network byte order ( big endian ).
* @param number The number in the host byte order to be converted.
87,7 → 89,7
* @param number The number in the network byte order to be converted.
* @returns The number in the host byte order.
*/
#define ntohs( number ) uint16_t_byteorder_swap( number )
#define ntohs( number ) uint16_t_byteorder_swap(( uint16_t )( number ))
 
/** Converts the given long number ( 32 bit ) from the network byte order ( big endian ) to the host byte order.
* @param number The number in the network byte order to be converted.