Author: colin Date: 2010-01-11 16:06:17 +0100 (Mon, 11 Jan 2010) New Revision: 35009 Changeset: http://dev.haiku-os.org/changeset/35009/haiku Modified: haiku/branches/developer/colin/wireless/headers/posix/sys/sockio.h haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/ieee80211.h haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/ieee80211_control.h haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/Device.h haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/Management.h Log: * Reverting Coding style cleanups regarding comments in headers. Totally forgot about plain C programs. Thx Stephan for the headups. * Note to myself: // comments were introduced after gcc 2.95.3! Modified: haiku/branches/developer/colin/wireless/headers/posix/sys/sockio.h =================================================================== --- haiku/branches/developer/colin/wireless/headers/posix/sys/sockio.h 2010-01-11 14:16:52 UTC (rev 35008) +++ haiku/branches/developer/colin/wireless/headers/posix/sys/sockio.h 2010-01-11 15:06:17 UTC (rev 35009) @@ -6,63 +6,63 @@ #define _SYS_SOCKIO_H -#define SIOCADDRT 8900 // add route -#define SIOCDELRT 8901 // delete route -#define SIOCSIFADDR 8902 // set interface address -#define SIOCGIFADDR 8903 // get interface address -#define SIOCSIFDSTADDR 8904 // set point-to-point address -#define SIOCGIFDSTADDR 8905 // get point-to-point address -#define SIOCSIFFLAGS 8906 // set interface flags -#define SIOCGIFFLAGS 8907 // get interface flags -#define SIOCGIFBRDADDR 8908 // get broadcast address -#define SIOCSIFBRDADDR 8909 // set broadcast address -#define SIOCGIFCOUNT 8910 // count interfaces -#define SIOCGIFCONF 8911 // get interface list -#define SIOCGIFINDEX 8912 // interface name -> index -#define SIOCGIFNAME 8913 // interface index -> name -#define SIOCGIFNETMASK 8914 // get net address mask -#define SIOCSIFNETMASK 8915 // set net address mask -#define SIOCGIFMETRIC 8916 // get interface metric -#define SIOCSIFMETRIC 8917 // set interface metric -#define SIOCDIFADDR 8918 // delete interface address -#define SIOCAIFADDR 8919 // configure interface alias -#define SIOCADDMULTI 8920 // add multicast address -#define SIOCDELMULTI 8921 // delete multicast address -#define SIOCGIFMTU 8922 // get interface MTU -#define SIOCSIFMTU 8923 // set interface MTU -#define SIOCSIFMEDIA 8924 // set net media -#define SIOCGIFMEDIA 8925 // get net media +#define SIOCADDRT 8900 /* add route */ +#define SIOCDELRT 8901 /* delete route */ +#define SIOCSIFADDR 8902 /* set interface address */ +#define SIOCGIFADDR 8903 /* get interface address */ +#define SIOCSIFDSTADDR 8904 /* set point-to-point address */ +#define SIOCGIFDSTADDR 8905 /* get point-to-point address */ +#define SIOCSIFFLAGS 8906 /* set interface flags */ +#define SIOCGIFFLAGS 8907 /* get interface flags */ +#define SIOCGIFBRDADDR 8908 /* get broadcast address */ +#define SIOCSIFBRDADDR 8909 /* set broadcast address */ +#define SIOCGIFCOUNT 8910 /* count interfaces */ +#define SIOCGIFCONF 8911 /* get interface list */ +#define SIOCGIFINDEX 8912 /* interface name -> index */ +#define SIOCGIFNAME 8913 /* interface index -> name */ +#define SIOCGIFNETMASK 8914 /* get net address mask */ +#define SIOCSIFNETMASK 8915 /* set net address mask */ +#define SIOCGIFMETRIC 8916 /* get interface metric */ +#define SIOCSIFMETRIC 8917 /* set interface metric */ +#define SIOCDIFADDR 8918 /* delete interface address */ +#define SIOCAIFADDR 8919 /* configure interface alias */ +#define SIOCADDMULTI 8920 /* add multicast address */ +#define SIOCDELMULTI 8921 /* delete multicast address */ +#define SIOCGIFMTU 8922 /* get interface MTU */ +#define SIOCSIFMTU 8923 /* set interface MTU */ +#define SIOCSIFMEDIA 8924 /* set net media */ +#define SIOCGIFMEDIA 8925 /* get net media */ -#define SIOCGRTSIZE 8926 // get route table size -#define SIOCGRTTABLE 8927 // get route table -#define SIOCGETRT 8928 // get route information for destination +#define SIOCGRTSIZE 8926 /* get route table size */ +#define SIOCGRTTABLE 8927 /* get route table */ +#define SIOCGETRT 8928 /* get route information for destination */ -#define SIOCGIFSTATS 8929 // get interface stats -#define SIOCGIFPARAM 8930 // get interface parameter -#define SIOCGIFTYPE 8931 // get interface type +#define SIOCGIFSTATS 8929 /* get interface stats */ +#define SIOCGIFPARAM 8930 /* get interface parameter */ +#define SIOCGIFTYPE 8931 /* get interface type */ -#define SIOCSPACKETCAP 8932 // Start capturing packets on an interface -#define SIOCCPACKETCAP 8933 // Stop capturing packets on an interface +#define SIOCSPACKETCAP 8932 /* Start capturing packets on an interface */ +#define SIOCCPACKETCAP 8933 /* Stop capturing packets on an interface */ -#define SIOCSHIWAT 8934 // set high watermark -#define SIOCGHIWAT 8935 // get high watermark -#define SIOCSLOWAT 8936 // set low watermark -#define SIOCGLOWAT 8937 // get low watermark -#define SIOCATMARK 8938 // at out-of-band mark? -#define SIOCSPGRP 8939 // set process group -#define SIOCGPGRP 8940 // get process group +#define SIOCSHIWAT 8934 /* set high watermark */ +#define SIOCGHIWAT 8935 /* get high watermark */ +#define SIOCSLOWAT 8936 /* set low watermark */ +#define SIOCGLOWAT 8937 /* get low watermark */ +#define SIOCATMARK 8938 /* at out-of-band mark? */ +#define SIOCSPGRP 8939 /* set process group */ +#define SIOCGPGRP 8940 /* get process group */ -#define SIOCGPRIVATE_0 8941 // device private 0 -#define SIOCGPRIVATE_1 8942 // device private 1 -#define SIOCSDRVSPEC 8943 // set driver-specific parameters -#define SIOCGDRVSPEC 8944 // get driver-specific parameters +#define SIOCGPRIVATE_0 8941 /* device private 0 */ +#define SIOCGPRIVATE_1 8942 /* device private 1 */ +#define SIOCSDRVSPEC 8943 /* set driver-specific parameters */ +#define SIOCGDRVSPEC 8944 /* get driver-specific parameters */ -#define SIOCSIFGENERIC 8945 // generic IF set op -#define SIOCGIFGENERIC 8946 // generic IF get op +#define SIOCSIFGENERIC 8945 /* generic IF set op */ +#define SIOCGIFGENERIC 8946 /* generic IF get op */ -#define SIOCG80211 8947 // get IEEE 802.11 data -#define SIOCS80211 8948 // set IEEE 802.11 data +#define SIOCG80211 8947 /* get IEEE 802.11 data */ +#define SIOCS80211 8948 /* set IEEE 802.11 data */ -#define SIOCEND 9000 // SIOCEND >= highest SIOC* +#define SIOCEND 9000 /* SIOCEND >= highest SIOC* */ -#endif // _SYS_SOCKIO_H +#endif /* _SYS_SOCKIO_H */ Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/ieee80211.h =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/ieee80211.h 2010-01-11 14:16:52 UTC (rev 35008) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/ieee80211.h 2010-01-11 15:06:17 UTC (rev 35009) @@ -7,9 +7,9 @@ #define IEEE80211_MTU 2304 - // IEEE 802.11-2007, p.60 + /* IEEE 802.11-2007, p.60 */ #define IEEE80211_NON_QOS_3_ADDRESS_DATA_HEADER_LENGTH 24 - // IEEE 802.11-2007, p.77 + /* IEEE 802.11-2007, p.77 */ -#endif // IEEE80211_H_ +#endif /* IEEE80211_H_ */ Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/ieee80211_control.h =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/ieee80211_control.h 2010-01-11 14:16:52 UTC (rev 35008) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/ieee80211_control.h 2010-01-11 15:06:17 UTC (rev 35009) @@ -11,17 +11,17 @@ #include <ieee80211_device.h> -// #pragma mark - request types +/* #pragma mark - request types */ enum request_t { - IEEE80211_IOC_CHANNEL, // get/set channel number - IEEE80211_IOC_BSSID, // get/set BSSID of desired WLAN - IEEE80211_IOC_CONN_REQ // connect to a specific WLAN + IEEE80211_IOC_CHANNEL, /* get/set channel number */ + IEEE80211_IOC_BSSID, /* get/set BSSID of desired WLAN */ + IEEE80211_IOC_CONN_REQ /* connect to a specific WLAN */ }; -// #pragma mark - request structures +/* #pragma mark - request structures */ struct request_data { @@ -40,4 +40,4 @@ status_t ieee80211_from_management(ieee80211_device*, ieee80211req_t*, size_t); status_t ieee80211_to_management(ieee80211_device*, ieee80211req_t*, size_t); -#endif // IEEE80211_CONTROL_H_ +#endif /* IEEE80211_CONTROL_H_ */ Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/Device.h =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/Device.h 2010-01-11 14:16:52 UTC (rev 35008) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/Device.h 2010-01-11 15:06:17 UTC (rev 35009) @@ -18,6 +18,6 @@ int fFileDescriptor; }; -} // namespace Ieee80211 +} /* namespace Ieee80211 */ -#endif // DEVICE_H_ +#endif /* DEVICE_H_ */ Modified: haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/Management.h =================================================================== --- haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/Management.h 2010-01-11 14:16:52 UTC (rev 35008) +++ haiku/branches/developer/colin/wireless/src/add-ons/kernel/network/devices/ieee80211/stack/Management.h 2010-01-11 15:06:17 UTC (rev 35009) @@ -6,4 +6,4 @@ #define MANAGEMENT_H_ -#endif // MANAGEMENT_H_ +#endif /* MANAGEMENT_H_ */