Changeset fdbc3ff in mainline for uspace/lib/net/generic/protocol_map.c

Timestamp:

2010-11-19T23:50:06Z (13 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.

File:

• uspace/lib/net/generic/protocol_map.c (modified) (5 diffs)

uspace/lib/net/generic/protocol_map.c

@@ -42 +42 @@
  * @param[in] nil       Network interface layer service.
  * @param[in] il        Internetwork layer service.
- * @returns             Network interface layer type of the internetworking
+ * @return              Network interface layer type of the internetworking
  *                      layer service.
- * @returns             Zero if mapping is not found.
+ * @return              Zero if mapping is not found.
  */
 eth_type_t protocol_map(services_t nil, services_t il)
@@ -68 +68 @@
  * @param[in] nil       Network interface layer service.
  * @param[in] protocol  Network interface layer type.
- * @returns             Internetwork layer service of the network interface
+ * @return              Internetwork layer service of the network interface
  *                      layer type.
- * @returns             Zero if mapping is not found.
+ * @return              Zero if mapping is not found.
  */
 services_t protocol_unmap(services_t nil, int protocol)
@@ -94 +94 @@
  *
  * @param[in] lsap      Link service access point identifier.
- * @returns             Ethernet protocol identifier of the link service access
+ * @return              Ethernet protocol identifier of the link service access
  *                      point identifier.
- * @returns             ETH_LSAP_NULL if mapping is not found.
+ * @return              ETH_LSAP_NULL if mapping is not found.
  */
 eth_type_t lsap_map(eth_lsap_t lsap)
@@ -114 +114 @@
  *
  * @param[in] ethertype Ethernet protocol identifier.
- * @returns             Link service access point identifier.
- * @returns             Zero if mapping is not found.
+ * @return              Link service access point identifier.
+ * @return              Zero if mapping is not found.
  */
 eth_lsap_t lsap_unmap(eth_type_t ethertype)
@@ -132 +132 @@
  *
  * @param[in] nil       The network interface service.
- * @returns             The hardware type of the network interface service.
- * @returns             Zero if mapping is not found.
+ * @return              The hardware type of the network interface service.
+ * @return              Zero if mapping is not found.
  */
 hw_type_t hardware_map(services_t nil)