From bb2dcaa05726bf057441bc6bbff8b13bd08e3c84 Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Sun, 24 Nov 2013 16:57:08 +0100 Subject: [PATCH] A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix --- apps/about/about-dsc.h | 6 +++--- apps/calc/calc-dsc.h | 6 +++--- apps/cmdd/cmdd.h | 6 +++--- apps/codeprop/codeprop-tmp.h | 6 +++--- apps/codeprop/codeprop.h | 6 +++--- apps/dhcp/dhcp-dsc.h | 6 +++--- apps/directory/directory-dsc.h | 6 +++--- apps/email/email-dsc.h | 6 +++--- apps/email/email.h | 6 +++--- apps/email/smtp.h | 6 +++--- apps/ftp/ftp-dsc.h | 6 +++--- apps/ftp/ftp.h | 6 +++--- apps/ftp/ftpc.h | 6 +++--- apps/http-post-auth/http-post-auth.h | 6 +++--- apps/httpd-ws/httpd-ws.h | 6 +++--- apps/irc/irc-dsc.h | 6 +++--- apps/irc/irc.h | 6 +++--- apps/irc/ircc.h | 6 +++--- apps/json/json.h | 6 +++--- apps/json/jsonparse.h | 6 +++--- apps/json/jsontree.h | 6 +++--- apps/netconf/netconf-dsc.h | 6 +++--- apps/ping6/ping6.h | 6 +++--- apps/process-list/process-list-dsc.h | 6 +++--- apps/program-handler/program-handler.h | 6 +++--- apps/serial-shell/serial-shell.h | 6 +++--- apps/shell/shell-base64.h | 6 +++--- apps/shell/shell-blink.h | 6 +++--- apps/shell/shell-checkpoint.h | 6 +++--- apps/shell/shell-coffee.h | 6 +++--- apps/shell/shell-crc.h | 6 +++--- apps/shell/shell-download.h | 6 +++--- apps/shell/shell-dsc.h | 6 +++--- apps/shell/shell-exec.h | 6 +++--- apps/shell/shell-file.h | 6 +++--- apps/shell/shell-httpd.h | 6 +++--- apps/shell/shell-irc.h | 6 +++--- apps/shell/shell-memdebug.h | 6 +++--- apps/shell/shell-netfile.h | 6 +++--- apps/shell/shell-netperf.h | 6 +++--- apps/shell/shell-netstat.h | 6 +++--- apps/shell/shell-ping.h | 6 +++--- apps/shell/shell-power.h | 6 +++--- apps/shell/shell-profile.h | 6 +++--- apps/shell/shell-ps.h | 6 +++--- apps/shell/shell-reboot.h | 6 +++--- apps/shell/shell-rime-debug-runicast.h | 6 +++--- apps/shell/shell-rime-debug.h | 6 +++--- apps/shell/shell-rime-neighbors.h | 6 +++--- apps/shell/shell-rime-netcmd.h | 6 +++--- apps/shell/shell-rime-ping.h | 6 +++--- apps/shell/shell-rime-sendcmd.h | 6 +++--- apps/shell/shell-rime-sniff.h | 6 +++--- apps/shell/shell-rime-unicast.h | 6 +++--- apps/shell/shell-rime.h | 6 +++--- apps/shell/shell-rsh.h | 6 +++--- apps/shell/shell-run.h | 6 +++--- apps/shell/shell-sendtest.h | 6 +++--- apps/shell/shell-sky.h | 6 +++--- apps/shell/shell-tcpsend.h | 6 +++--- apps/shell/shell-text.h | 6 +++--- apps/shell/shell-time.h | 6 +++--- apps/shell/shell-udpsend.h | 6 +++--- apps/shell/shell-vars.h | 6 +++--- apps/shell/shell-wget.h | 6 +++--- apps/shell/shell.h | 6 +++--- apps/slip-cmd/cmd.h | 6 +++--- apps/slip-cmd/packetutils.h | 6 +++--- apps/telnet/simpletelnet.h | 6 +++--- apps/telnet/telnet-dsc.h | 6 +++--- apps/telnet/telnet.h | 6 +++--- apps/telnetd/telnetd-dsc.h | 6 +++--- apps/telnetd/telnetd.h | 6 +++--- apps/vnc/vnc-draw.h | 6 +++--- apps/vnc/vnc-dsc.h | 6 +++--- apps/vnc/vnc-viewer.h | 6 +++--- apps/vnc/vnc.h | 6 +++--- apps/webbrowser/htmlparser.h | 6 +++--- apps/webbrowser/webclient.h | 6 +++--- apps/webbrowser/www-dsc.h | 6 +++--- apps/webbrowser/www.h | 6 +++--- apps/webserver-nano/httpd-cfs.h | 6 +++--- apps/webserver-nano/httpd-cgi.h | 6 +++--- apps/webserver-nano/httpd-fs.h | 6 +++--- apps/webserver-nano/httpd-fsdata.h | 6 +++--- apps/webserver-nano/httpd.h | 6 +++--- apps/webserver-nano/urlconv.h | 6 +++--- apps/webserver-nano/webserver-dsc.h | 6 +++--- apps/webserver-nano/webserver-nogui.h | 6 +++--- apps/webserver-nano/webserver.h | 6 +++--- apps/webserver/httpd-cfs.h | 6 +++--- apps/webserver/httpd-cgi.h | 6 +++--- apps/webserver/httpd-fs.h | 6 +++--- apps/webserver/httpd-fsdata.h | 6 +++--- apps/webserver/httpd.h | 6 +++--- apps/webserver/urlconv.h | 6 +++--- apps/webserver/webserver-dsc.h | 6 +++--- apps/webserver/webserver-nogui.h | 6 +++--- apps/webserver/webserver.h | 6 +++--- core/cfs/cfs.h | 6 +++--- core/contiki-lib.h | 6 +++--- core/contiki-net.h | 6 +++--- core/contiki.h | 6 +++--- core/ctk/ctk-conio.h | 6 +++--- core/ctk/ctk-draw.h | 6 +++--- core/ctk/ctk-mouse.h | 6 +++--- core/ctk/ctk-vncarch.h | 6 +++--- core/ctk/ctk-vncfont.h | 6 +++--- core/ctk/ctk-vncserver.h | 6 +++--- core/ctk/ctk.h | 6 +++--- core/ctk/vnc-out.h | 6 +++--- core/ctk/vnc-server.h | 6 +++--- core/dev/battery-sensor.h | 6 +++--- core/dev/button-sensor.h | 6 +++--- core/dev/cc2420-aes.h | 6 +++--- core/dev/cc2420.h | 6 +++--- core/dev/cc2520.h | 6 +++--- core/dev/eeprom.h | 6 +++--- core/dev/leds.h | 6 +++--- core/dev/radio-sensor.h | 6 +++--- core/dev/radio.h | 6 +++--- core/dev/serial-line.h | 6 +++--- core/dev/sht11-sensor.h | 6 +++--- core/dev/slip.h | 6 +++--- core/dev/spi.h | 6 +++--- core/dev/watchdog.h | 6 +++--- core/lib/crc16.h | 6 +++--- core/lib/ctk-filedialog.h | 6 +++--- core/lib/ctk-textentry-checkbox.h | 6 +++--- core/lib/ctk-textentry-cmdline.h | 6 +++--- core/lib/ctk-textentry-multiline.h | 6 +++--- core/lib/gcr.h | 6 +++--- core/lib/libconio.h | 6 +++--- core/lib/list.h | 6 +++--- core/lib/me.h | 6 +++--- core/lib/me_tabs.h | 6 +++--- core/lib/memb.h | 6 +++--- core/lib/mmem.h | 6 +++--- core/lib/petsciiconv.h | 6 +++--- core/lib/print-stats.h | 6 +++--- core/lib/random.h | 6 +++--- core/lib/ringbuf.h | 6 +++--- core/lib/sensors.h | 6 +++--- core/lib/settings.h | 6 +++--- core/lib/trickle-timer.h | 6 +++--- core/loader/dlloader.h | 6 +++--- core/loader/elfloader-arch.h | 6 +++--- core/loader/elfloader.h | 6 +++--- core/loader/elfloader_compat.h | 6 +++--- core/loader/symbols-def.h | 6 +++--- core/loader/symbols.h | 6 +++--- core/loader/symtab.h | 6 +++--- core/net/dhcpc.h | 6 +++--- core/net/mac/csma.h | 6 +++--- core/net/mac/cxmac.h | 6 +++--- core/net/mac/framer-802154.h | 6 +++--- core/net/mac/framer-nullmac.h | 6 +++--- core/net/mac/framer.h | 6 +++--- core/net/mac/lpp.h | 6 +++--- core/net/mac/mac.h | 6 +++--- core/net/mac/nullmac.h | 6 +++--- core/net/mac/nullrdc-noframer.h | 6 +++--- core/net/mac/nullrdc.h | 6 +++--- core/net/mac/rdc.h | 6 +++--- core/net/mac/sicslowmac.h | 6 +++--- core/net/mac/xmac.h | 6 +++--- core/net/nbr-table.h | 6 +++--- core/net/packetbuf.h | 6 +++--- core/net/packetqueue.h | 6 +++--- core/net/psock.h | 6 +++--- core/net/queuebuf.h | 6 +++--- core/net/resolv.h | 6 +++--- core/net/rime.h | 6 +++--- core/net/rime/abc.h | 6 +++--- core/net/rime/announcement.h | 6 +++--- core/net/rime/broadcast-announcement.h | 6 +++--- core/net/rime/broadcast.h | 6 +++--- core/net/rime/chameleon-bitopt.h | 6 +++--- core/net/rime/chameleon-raw.h | 6 +++--- core/net/rime/chameleon.h | 6 +++--- core/net/rime/channel.h | 6 +++--- core/net/rime/collect-neighbor.h | 6 +++--- core/net/rime/collect.h | 6 +++--- core/net/rime/ipolite.h | 6 +++--- core/net/rime/mesh.h | 6 +++--- core/net/rime/multihop.h | 6 +++--- core/net/rime/neighbor-discovery.h | 6 +++--- core/net/rime/netflood.h | 6 +++--- core/net/rime/polite-announcement.h | 6 +++--- core/net/rime/polite.h | 6 +++--- core/net/rime/rime-udp.h | 6 +++--- core/net/rime/rimeaddr.h | 6 +++--- core/net/rime/rimestats.h | 6 +++--- core/net/rime/rmh.h | 6 +++--- core/net/rime/route-discovery.h | 6 +++--- core/net/rime/route.h | 6 +++--- core/net/rime/rucb.h | 6 +++--- core/net/rime/rudolph0.h | 6 +++--- core/net/rime/rudolph1.h | 6 +++--- core/net/rime/rudolph2.h | 6 +++--- core/net/rime/runicast.h | 6 +++--- core/net/rime/stbroadcast.h | 6 +++--- core/net/rime/stunicast.h | 6 +++--- core/net/rime/timesynch.h | 6 +++--- core/net/rime/trickle.h | 6 +++--- core/net/rime/unicast.h | 6 +++--- core/net/sicslowpan.h | 6 +++--- core/net/slipdev.h | 6 +++--- core/net/tcpip.h | 6 +++--- core/net/uaodv-def.h | 6 +++--- core/net/uaodv-rt.h | 6 +++--- core/net/uaodv.h | 6 +++--- core/net/uip-ds6-nbr.h | 6 +++--- core/net/uip-ds6.h | 6 +++--- core/net/uip-fw-drv.h | 6 +++--- core/net/uip-fw.h | 6 +++--- core/net/uip-icmp6.h | 6 +++--- core/net/uip-nd6.h | 6 +++--- core/net/uip-neighbor.h | 6 +++--- core/net/uip-over-mesh.h | 6 +++--- core/net/uip-split.h | 6 +++--- core/net/uip-udp-packet.h | 6 +++--- core/net/uip.h | 6 +++--- core/net/uip_arch.h | 6 +++--- core/net/uip_arp.h | 6 +++--- core/net/uiplib.h | 6 +++--- core/net/uipopt.h | 6 +++--- core/sys/arg.h | 6 +++--- core/sys/autostart.h | 6 +++--- core/sys/cc.h | 6 +++--- core/sys/clock.h | 6 +++--- core/sys/compower.h | 6 +++--- core/sys/ctimer.h | 6 +++--- core/sys/dsc.h | 6 +++--- core/sys/energest.h | 6 +++--- core/sys/etimer.h | 6 +++--- core/sys/lc-addrlabels.h | 6 +++--- core/sys/lc-switch.h | 6 +++--- core/sys/lc.h | 6 +++--- core/sys/loader.h | 6 +++--- core/sys/log.h | 6 +++--- core/sys/mt.h | 6 +++--- core/sys/node-id.h | 6 +++--- core/sys/process.h | 6 +++--- core/sys/procinit.h | 6 +++--- core/sys/pt-sem.h | 6 +++--- core/sys/pt.h | 6 +++--- core/sys/rtimer.h | 6 +++--- core/sys/stimer.h | 6 +++--- core/sys/subprocess.h | 6 +++--- core/sys/timer.h | 6 +++--- cpu/6502/6502def.h | 6 +++--- cpu/6502/lib/config.h | 6 +++--- cpu/6502/lib/error.h | 6 +++--- cpu/6502/lib/pfs.h | 6 +++--- cpu/6502/lib/unload.h | 6 +++--- cpu/6502/net/ethernet-drv.h | 6 +++--- cpu/6502/net/ethernet.h | 6 +++--- cpu/6502/sys/lc.h | 6 +++--- cpu/6502/sys/mtarch.h | 6 +++--- cpu/6502/sys/rtimer-arch.h | 6 +++--- cpu/arm/at91sam7s/debug-uart.h | 6 +++--- cpu/arm/at91sam7s/io.h | 6 +++--- cpu/arm/at91sam7s/loader/codeprop-otf.h | 6 +++--- cpu/arm/at91sam7s/loader/elfloader-arch-otf.h | 6 +++--- cpu/arm/at91sam7s/loader/elfloader-otf.h | 6 +++--- cpu/arm/at91sam7s/loader/ram-segments.h | 6 +++--- cpu/arm/at91sam7s/rtimer-arch-interrupt.h | 6 +++--- cpu/arm/at91sam7s/rtimer-arch.h | 6 +++--- cpu/arm/at91sam7s/sys-interrupt.h | 6 +++--- cpu/arm/at91sam7s/usb-interrupt.h | 6 +++--- cpu/arm/common/SD-card/config.h | 4 ++-- cpu/arm/common/SD-card/efs-sdcard.h | 6 +++--- cpu/arm/common/SD-card/efsl_spi.h | 6 +++--- cpu/arm/common/SD-card/sdcard.h | 6 +++--- cpu/arm/common/dbg-io/strformat.h | 6 +++--- cpu/arm/common/usb/cdc-acm/cdc-acm.h | 6 +++--- cpu/arm/common/usb/cdc-acm/cdc.h | 6 +++--- cpu/arm/common/usb/cdc-eth/cdc-eth.h | 6 +++--- cpu/arm/common/usb/cdc-eth/dhcps.h | 6 +++--- cpu/arm/common/usb/descriptors.h | 6 +++--- cpu/arm/common/usb/msc/rbc_const.h | 6 +++--- cpu/arm/common/usb/msc/rbc_struct.h | 6 +++--- cpu/arm/common/usb/msc/scsi_command.h | 6 +++--- cpu/arm/common/usb/msc/spc2_struct.h | 6 +++--- cpu/arm/common/usb/msc/usb-msc-bulk.h | 6 +++--- cpu/arm/common/usb/usb-api.h | 6 +++--- cpu/arm/common/usb/usb-arch.h | 6 +++--- cpu/arm/common/usb/usb-core.h | 6 +++--- cpu/arm/common/usb/usb.h | 6 +++--- cpu/arm/stm32f103/debug-uart.h | 6 +++--- cpu/arm/stm32f103/gpio.h | 6 +++--- cpu/arm/stm32f103/nvic.h | 6 +++--- cpu/arm/stm32f103/rtimer-arch.h | 6 +++--- cpu/avr/bootloader.h | 4 ++-- cpu/avr/dev/compiler.h | 6 +++--- cpu/avr/dev/debug.h | 6 +++--- cpu/avr/dev/flash.h | 6 +++--- cpu/avr/dev/rs232.h | 6 +++--- cpu/avr/dev/usb/compiler.h | 6 +++--- cpu/avr/dev/usb/conf_usb.h | 6 +++--- cpu/avr/dev/usb/config.h | 6 +++--- cpu/avr/dev/usb/rndis/cdc_ecm.h | 6 +++--- cpu/avr/dev/usb/rndis/cdc_eem.h | 6 +++--- cpu/avr/dev/usb/rndis/rndis_task.h | 6 +++--- cpu/avr/dev/usb/serial/uart_usb_lib.h | 6 +++--- cpu/avr/dev/usb/storage/avr_flash.h | 6 +++--- cpu/avr/dev/usb/storage/conf_access.h | 6 +++--- cpu/avr/dev/usb/storage/ctrl_access.h | 6 +++--- cpu/avr/dev/usb/storage/ctrl_status.h | 6 +++--- cpu/avr/dev/usb/storage/scsi_decoder.h | 6 +++--- cpu/avr/dev/usb/storage/storage_task.h | 6 +++--- cpu/avr/dev/usb/usb_descriptors.h | 6 +++--- cpu/avr/dev/usb/usb_drv.h | 6 +++--- cpu/avr/dev/usb/usb_specific_request.h | 6 +++--- cpu/avr/dev/usb/usb_standard_request.h | 6 +++--- cpu/avr/dev/usb/usb_task.h | 6 +++--- cpu/avr/mtarch.h | 6 +++--- cpu/avr/radio/ieee-manager/ieee-15-4-manager.h | 6 +++--- cpu/avr/radio/mac/sicslowmac.h | 6 +++--- cpu/avr/rtimer-arch.h | 6 +++--- cpu/cc2430/8051def.h | 6 +++--- cpu/cc2430/dev/bus.h | 6 +++--- cpu/cc2430/dev/cc2430_rf.h | 6 +++--- cpu/cc2430/dev/hwconf.h | 6 +++--- cpu/cc2430/dev/lpm.h | 6 +++--- cpu/cc2430/mtarch.h | 6 +++--- cpu/cc2430/rtimer-arch.h | 6 +++--- cpu/cc2538/mtarch.h | 6 +++--- cpu/cc253x/8051def.h | 6 +++--- cpu/cc253x/cc253x.h | 6 +++--- cpu/cc253x/dev/cc2530-rf.h | 6 +++--- cpu/cc253x/dev/clock-isr.h | 6 +++--- cpu/cc253x/dev/lpm.h | 6 +++--- cpu/cc253x/dev/port.h | 2 +- cpu/cc253x/dev/port2.h | 4 ++-- cpu/cc253x/mtarch.h | 6 +++--- cpu/cc253x/rtimer-arch.h | 6 +++--- cpu/cc253x/soc.h | 6 +++--- cpu/cc253x/usb/common/cdc-acm/cdc-acm.h | 6 +++--- cpu/cc253x/usb/common/cdc-acm/cdc.h | 6 +++--- cpu/cc253x/usb/common/descriptors.h | 6 +++--- cpu/cc253x/usb/common/usb-api.h | 6 +++--- cpu/cc253x/usb/common/usb-arch.h | 6 +++--- cpu/cc253x/usb/common/usb-core.h | 6 +++--- cpu/cc253x/usb/common/usb.h | 6 +++--- cpu/mc1322x/contiki-mc1322x-conf.h | 4 ++-- cpu/mc1322x/debug-uart.h | 6 +++--- cpu/mc1322x/lib/include/maca.h | 6 +++--- cpu/mc1322x/mtarch.h | 6 +++--- cpu/mc1322x/rtimer-arch.h | 6 +++--- cpu/msp430/dev/flash.h | 6 +++--- cpu/msp430/dev/hwconf.h | 6 +++--- cpu/msp430/dev/lpm.h | 6 +++--- cpu/msp430/dev/uart0.h | 6 +++--- cpu/msp430/dev/uart1.h | 6 +++--- cpu/msp430/isr_compat.h | 4 ++-- cpu/msp430/mtarch.h | 6 +++--- cpu/msp430/rtimer-arch.h | 6 +++--- cpu/native/mtarch.h | 6 +++--- cpu/native/net/tapdev-drv.h | 6 +++--- cpu/native/net/tapdev.h | 6 +++--- cpu/native/net/tapdev6.h | 6 +++--- cpu/native/net/wpcap-drv.h | 6 +++--- cpu/native/net/wpcap.h | 6 +++--- cpu/native/rtimer-arch.h | 6 +++--- cpu/pic32/debug-uart.h | 4 ++-- cpu/pic32/lib/pic32_clock.h | 6 +++--- cpu/pic32/lib/pic32_irq.h | 6 +++--- cpu/pic32/lib/pic32_spi.h | 6 +++--- cpu/pic32/lib/pic32_timer.h | 6 +++--- cpu/pic32/lib/pic32_uart.h | 6 +++--- cpu/pic32/mtarch.h | 6 +++--- cpu/pic32/pic32.h | 6 +++--- cpu/pic32/rtimer-arch.h | 6 +++--- cpu/stm32w108/dev/stm32w-radio.h | 6 +++--- cpu/stm32w108/dev/uart1.h | 6 +++--- cpu/stm32w108/e_stdio/src/mbctype.h | 6 +++--- cpu/stm32w108/hal/error.h | 6 +++--- cpu/stm32w108/hal/hal.h | 6 +++--- cpu/stm32w108/hal/micro/adc.h | 6 +++--- cpu/stm32w108/hal/micro/button.h | 6 +++--- .../hal/micro/cortexm3/bootloader/fib-bootloader.h | 6 +++--- cpu/stm32w108/hal/micro/cortexm3/compiler/asm.h | 6 +++--- cpu/stm32w108/hal/micro/cortexm3/compiler/gnu.h | 6 +++--- cpu/stm32w108/hal/micro/cortexm3/compiler/iar.h | 6 +++--- cpu/stm32w108/hal/micro/cortexm3/flash.h | 6 +++--- cpu/stm32w108/hal/micro/cortexm3/memmap-fat.h | 8 ++++---- cpu/stm32w108/hal/micro/cortexm3/memmap.h | 6 +++--- cpu/stm32w108/hal/micro/cortexm3/mfg-token.h | 6 +++--- cpu/stm32w108/hal/micro/cortexm3/micro-common.h | 6 +++--- cpu/stm32w108/hal/micro/cortexm3/mpu.h | 6 +++--- cpu/stm32w108/hal/micro/cortexm3/nvm-def.h | 6 +++--- cpu/stm32w108/hal/micro/cortexm3/nvm.h | 6 +++--- cpu/stm32w108/hal/micro/cortexm3/stm32w108/board.h | 6 +++--- cpu/stm32w108/hal/micro/cortexm3/stm32w108/memmap.h | 8 ++++---- cpu/stm32w108/hal/micro/cortexm3/stm32w108/regs.h | 6 +++--- cpu/stm32w108/hal/micro/cortexm3/uart.h | 6 +++--- .../hal/micro/generic/compiler/platform-common.h | 6 +++--- cpu/stm32w108/hal/micro/mems-regs.h | 6 +++--- cpu/stm32w108/hal/micro/mems.h | 6 +++--- cpu/stm32w108/hal/micro/micro-common.h | 6 +++--- cpu/stm32w108/hal/micro/system-timer.h | 6 +++--- cpu/stm32w108/hal/micro/temperature-sensor.h | 6 +++--- cpu/stm32w108/mtarch.h | 6 +++--- cpu/stm32w108/rtimer-arch.h | 6 +++--- cpu/stm32w108/simplemac/include/phy-library.h | 4 ++-- cpu/stm32w108/small-printf/vfieeefp.h | 6 +++--- cpu/x86/mtarch.h | 6 +++--- examples/er-rest-example/project-conf.h | 6 +++--- examples/ipv6/json-ws/json-ws.h | 6 +++--- examples/ipv6/json-ws/project-conf.h | 6 +++--- examples/ipv6/native-border-router/border-router-cmds.h | 6 +++--- examples/ipv6/native-border-router/border-router.h | 6 +++--- examples/ipv6/native-border-router/httpd-simple.h | 6 +++--- examples/ipv6/native-border-router/project-conf.h | 6 +++--- examples/ipv6/rpl-border-router/httpd-simple.h | 6 +++--- examples/ipv6/rpl-border-router/project-conf.h | 6 +++--- examples/ipv6/rpl-collect/collect-common.h | 6 +++--- examples/ipv6/sky-websense/project-conf.h | 6 +++--- examples/ipv6/sky-websense/wget.h | 6 +++--- examples/ipv6/slip-radio/project-conf.h | 6 +++--- examples/ipv6/slip-radio/slip-radio.h | 6 +++--- examples/mbxxx/mbxxx-websense/project-conf.h | 6 +++--- examples/mbxxx/webserver-ajax/webserver-ajax-conf.h | 6 +++--- examples/rest-example/project-conf.h | 6 +++--- examples/seedeye/powerswitch/project-conf.h | 6 +++--- examples/udp-stream/project-conf.h | 6 +++--- examples/z1/ipv6/z1-websense/project-conf.h | 6 +++--- examples/z1/ipv6/z1-websense/wget.h | 6 +++--- examples/z1/rssi_scanner/project-conf.h | 6 +++--- platform/apple2enh/contiki-conf.h | 6 +++--- platform/atarixl/contiki-conf.h | 6 +++--- .../avr-atmega128rfa1/apps/raven-webserver/httpd-cfs.h | 6 +++--- .../avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.h | 6 +++--- .../avr-atmega128rfa1/apps/raven-webserver/httpd-fs.h | 6 +++--- .../avr-atmega128rfa1/apps/raven-webserver/httpd-fsdata.h | 6 +++--- platform/avr-atmega128rfa1/apps/raven-webserver/httpd.h | 6 +++--- .../apps/raven-webserver/webserver-dsc.h | 6 +++--- .../apps/raven-webserver/webserver-nogui.h | 6 +++--- .../avr-atmega128rfa1/apps/raven-webserver/webserver.h | 6 +++--- platform/avr-atmega128rfa1/contiki-conf.h | 6 +++--- platform/avr-atmega128rfa1/params.h | 6 +++--- platform/avr-raven/apps/raven-webserver/httpd-cfs.h | 6 +++--- platform/avr-raven/apps/raven-webserver/httpd-cgi.h | 6 +++--- platform/avr-raven/apps/raven-webserver/httpd-fs.h | 6 +++--- platform/avr-raven/apps/raven-webserver/httpd-fsdata.h | 6 +++--- platform/avr-raven/apps/raven-webserver/httpd.h | 6 +++--- platform/avr-raven/apps/raven-webserver/webserver-dsc.h | 6 +++--- platform/avr-raven/apps/raven-webserver/webserver-nogui.h | 6 +++--- platform/avr-raven/apps/raven-webserver/webserver.h | 6 +++--- platform/avr-raven/contiki-conf.h | 6 +++--- platform/avr-raven/contiki-raven.h | 6 +++--- platform/avr-raven/params.h | 6 +++--- platform/avr-ravenlcd/adc.h | 6 +++--- platform/avr-ravenlcd/key.h | 6 +++--- platform/avr-ravenlcd/lcd.h | 6 +++--- platform/avr-ravenlcd/main.h | 6 +++--- platform/avr-ravenlcd/sleep.h | 6 +++--- platform/avr-ravenlcd/temp.h | 6 +++--- platform/avr-ravenlcd/uart.h | 6 +++--- platform/avr-ravenusb/cdc_task.h | 6 +++--- platform/avr-ravenusb/contiki-conf.h | 6 +++--- platform/avr-ravenusb/contiki-raven.h | 6 +++--- platform/avr-ravenusb/rng.h | 4 ++-- platform/avr-rcb/contiki-conf.h | 6 +++--- platform/avr-rcb/contiki-rcb.h | 6 +++--- platform/avr-zigbit/contiki-avr-zigbit.h | 6 +++--- platform/avr-zigbit/contiki-conf.h | 6 +++--- platform/c128/contiki-conf.h | 6 +++--- platform/c64/contiki-conf.h | 6 +++--- platform/cc2530dk/contiki-conf.h | 6 +++--- platform/cc2530dk/debug.h | 6 +++--- platform/cc2530dk/dev/adc-sensor.h | 6 +++--- platform/cc2530dk/dev/button-sensor.h | 6 +++--- platform/cc2530dk/dev/leds-arch.h | 6 +++--- platform/cc2530dk/models.h | 6 +++--- platform/cooja/contiki-conf.h | 6 +++--- platform/cooja/dev/beep.h | 6 +++--- platform/cooja/dev/button-sensor.h | 6 +++--- platform/cooja/dev/cooja-radio.h | 6 +++--- platform/cooja/dev/ip.h | 6 +++--- platform/cooja/dev/moteid.h | 6 +++--- platform/cooja/dev/pir-sensor.h | 6 +++--- platform/cooja/dev/rs232.h | 6 +++--- platform/cooja/dev/vib-sensor.h | 6 +++--- platform/cooja/lib/simEnvChange.h | 6 +++--- platform/cooja/mtarch.h | 6 +++--- platform/cooja/net/init-net.h | 6 +++--- platform/cooja/net/radio-uip-uaodv.h | 6 +++--- platform/cooja/net/uip-driver.h | 6 +++--- platform/cooja/rtimer-arch.h | 6 +++--- platform/cooja/sys/cooja_mt.h | 6 +++--- platform/cooja/sys/cooja_mtarch.h | 6 +++--- platform/cooja/sys/node-id.h | 6 +++--- platform/econotag/contiki-conf.h | 6 +++--- platform/exp5438/platform-conf.h | 6 +++--- platform/iris/contiki-conf.h | 6 +++--- platform/iris/dev/adc.h | 6 +++--- platform/iris/dev/sensors/mts300.h | 6 +++--- platform/iris/init-net.h | 6 +++--- platform/iris/platform-conf.h | 6 +++--- platform/mbxxx/apps/shell-sensors.h | 6 +++--- platform/mbxxx/board.h | 6 +++--- platform/mbxxx/contiki-conf.h | 6 +++--- platform/mbxxx/contiki-init-net.h | 6 +++--- platform/mbxxx/dev/acc-sensor.h | 6 +++--- platform/mbxxx/dev/contact-sensor.h | 6 +++--- platform/mbxxx/dev/mems.h | 6 +++--- platform/mbxxx/dev/mems_regs.h | 6 +++--- platform/mbxxx/dev/temperature-sensor.h | 6 +++--- platform/mbxxx/platform-conf.h | 6 +++--- platform/micaz/contiki-conf.h | 6 +++--- platform/micaz/dev/adc.h | 6 +++--- platform/micaz/dev/sensors/mts300.h | 6 +++--- platform/micaz/init-net.h | 6 +++--- platform/micaz/platform-conf.h | 6 +++--- platform/minimal-net/contiki-conf.h | 6 +++--- platform/native/contiki-conf.h | 6 +++--- platform/native/ctk/ctk-curses.h | 6 +++--- platform/native/dev/beep.h | 6 +++--- platform/native/dev/button-sensor.h | 6 +++--- platform/native/dev/pir-sensor.h | 6 +++--- platform/native/dev/temperature-sensor.h | 6 +++--- platform/native/dev/vib-sensor.h | 6 +++--- platform/seedeye/dev/mrf24j40/mrf24j40.h | 6 +++--- platform/seedeye/dev/mrf24j40/mrf24j40_arch.h | 6 +++--- platform/seedeye/init-net.h | 6 +++--- platform/seedeye/platform-conf.h | 6 +++--- platform/sensinode/contiki-conf.h | 6 +++--- platform/sensinode/dev/button-sensor.h | 6 +++--- platform/sensinode/dev/models.h | 6 +++--- platform/sky/dev/light-sensor.h | 6 +++--- platform/sky/dev/light.h | 6 +++--- platform/sky/dev/sky-sensors.h | 6 +++--- platform/sky/dev/temperature-sensor.h | 6 +++--- platform/sky/platform-conf.h | 6 +++--- platform/stm32test/contiki-conf.h | 6 +++--- platform/win32/contiki-conf.h | 6 +++--- platform/win32/ctk/ctk-console.h | 6 +++--- platform/win32/loader/dll-loader.h | 6 +++--- platform/win32/loader/unload.h | 6 +++--- platform/wismote/dev/acc-sensor.h | 6 +++--- platform/wismote/dev/ext-sensor.h | 6 +++--- platform/wismote/dev/light-sensor.h | 6 +++--- platform/wismote/dev/light.h | 6 +++--- platform/wismote/dev/sky-sensors.h | 6 +++--- platform/wismote/platform-conf.h | 6 +++--- platform/z1/dev/adxl345.h | 6 +++--- platform/z1/dev/i2cmaster.h | 6 +++--- platform/z1/dev/light-sensor.h | 6 +++--- platform/z1/dev/light-ziglet.h | 6 +++--- platform/z1/dev/light.h | 6 +++--- platform/z1/dev/potentiometer-sensor.h | 6 +++--- platform/z1/dev/relay-phidget.h | 6 +++--- platform/z1/dev/sky-sensors.h | 6 +++--- platform/z1/dev/temperature-sensor.h | 6 +++--- platform/z1/dev/tlc59116.h | 6 +++--- platform/z1/dev/tmp102.h | 6 +++--- platform/z1/dev/z1-phidgets.h | 6 +++--- platform/z1/platform-conf.h | 6 +++--- platform/z1sp/dev/potentiometer-sensor.h | 6 +++--- platform/z1sp/platform-conf.h | 6 +++--- tools/cooja/examples/project_new_interface/dummy_intf.h | 6 +++--- tools/sky/uip6-bridge/bridge-conf.h | 6 +++--- tools/sky/uip6-bridge/dev/slip.h | 6 +++--- tools/stm32w/uip6_bridge/bridge-conf.h | 6 +++--- tools/stm32w/uip6_bridge/dev/slip.h | 6 +++--- tools/stm32w/wpcapslip6/contiki-conf.h | 6 +++--- tools/stm32w/wpcapslip6/rtimer-arch.h | 6 +++--- tools/wpcapslip/contiki-conf.h | 6 +++--- tools/z80/hex2bin/src/ihx2bin.h | 6 +++--- 572 files changed, 1708 insertions(+), 1708 deletions(-) diff --git a/apps/about/about-dsc.h b/apps/about/about-dsc.h index 83cae0f90..13e4fe6e8 100644 --- a/apps/about/about-dsc.h +++ b/apps/about/about-dsc.h @@ -31,11 +31,11 @@ * * */ -#ifndef __ABOUT_DSC_H__ -#define __ABOUT_DSC_H__ +#ifndef ABOUT_DSC_H_ +#define ABOUT_DSC_H_ #include "sys/dsc.h" DSC_HEADER(about_dsc); -#endif /* __ABOUT_DSC_H__ */ +#endif /* ABOUT_DSC_H_ */ diff --git a/apps/calc/calc-dsc.h b/apps/calc/calc-dsc.h index 48be8da31..e583f6edb 100644 --- a/apps/calc/calc-dsc.h +++ b/apps/calc/calc-dsc.h @@ -31,11 +31,11 @@ * * */ -#ifndef __CALC_DSC_H__ -#define __CALC_DSC_H__ +#ifndef CALC_DSC_H_ +#define CALC_DSC_H_ #include "sys/dsc.h" DSC_HEADER(calc_dsc); -#endif /* __CALC_DSC_H__ */ +#endif /* CALC_DSC_H_ */ diff --git a/apps/cmdd/cmdd.h b/apps/cmdd/cmdd.h index a4ec4e908..ab8a48c1b 100644 --- a/apps/cmdd/cmdd.h +++ b/apps/cmdd/cmdd.h @@ -1,8 +1,8 @@ -#ifndef __CMDD_H__ -#define __CMDD_H__ +#ifndef CMDD_H_ +#define CMDD_H_ #include "contiki.h" PROCESS_NAME(cmdd_process); -#endif /* __CMDD_H__ */ +#endif /* CMDD_H_ */ diff --git a/apps/codeprop/codeprop-tmp.h b/apps/codeprop/codeprop-tmp.h index 510925b9d..4be406310 100644 --- a/apps/codeprop/codeprop-tmp.h +++ b/apps/codeprop/codeprop-tmp.h @@ -29,8 +29,8 @@ * This file is part of the Contiki operating system. * */ -#ifndef __CODEPROP_H__ -#define __CODEPROP_H__ +#ifndef CODEPROP_H_ +#define CODEPROP_H_ #include "contiki.h" @@ -43,4 +43,4 @@ void codeprop_start_broadcast(unsigned int len); void codeprop_exit_program(void); int codeprop_start_program(void); -#endif /* __CODEPROP_H__ */ +#endif /* CODEPROP_H_ */ diff --git a/apps/codeprop/codeprop.h b/apps/codeprop/codeprop.h index a30d13f98..baea35341 100644 --- a/apps/codeprop/codeprop.h +++ b/apps/codeprop/codeprop.h @@ -29,8 +29,8 @@ * This file is part of the Contiki operating system. * */ -#ifndef __CODEPROP_H__ -#define __CODEPROP_H__ +#ifndef CODEPROP_H_ +#define CODEPROP_H_ #include "contiki.h" @@ -50,4 +50,4 @@ void codeprop_set_rate(clock_time_t time); void codeprop_start_broadcast(unsigned int len); void codeprop_start_program(void); -#endif /* __CODEPROP_H__ */ +#endif /* CODEPROP_H_ */ diff --git a/apps/dhcp/dhcp-dsc.h b/apps/dhcp/dhcp-dsc.h index bced638a8..77c65fa12 100644 --- a/apps/dhcp/dhcp-dsc.h +++ b/apps/dhcp/dhcp-dsc.h @@ -31,11 +31,11 @@ * * */ -#ifndef __DHCP_DSC_H__ -#define __DHCP_DSC_H__ +#ifndef DHCP_DSC_H_ +#define DHCP_DSC_H_ #include "sys/dsc.h" DSC_HEADER(dhcp_dsc); -#endif /* __DHCP_DSC_H__ */ +#endif /* DHCP_DSC_H_ */ diff --git a/apps/directory/directory-dsc.h b/apps/directory/directory-dsc.h index 4c959c888..7a9b3181a 100644 --- a/apps/directory/directory-dsc.h +++ b/apps/directory/directory-dsc.h @@ -31,11 +31,11 @@ * * */ -#ifndef __DIRECTORY_DSC_H__ -#define __DIRECTORY_DSC_H__ +#ifndef DIRECTORY_DSC_H_ +#define DIRECTORY_DSC_H_ #include "sys/dsc.h" DSC_HEADER(directory_dsc); -#endif /* __DIRECTORY_DSC_H__ */ +#endif /* DIRECTORY_DSC_H_ */ diff --git a/apps/email/email-dsc.h b/apps/email/email-dsc.h index c1508b4d0..d93112986 100644 --- a/apps/email/email-dsc.h +++ b/apps/email/email-dsc.h @@ -31,11 +31,11 @@ * * */ -#ifndef __EMAIL_DSC_H__ -#define __EMAIL_DSC_H__ +#ifndef EMAIL_DSC_H_ +#define EMAIL_DSC_H_ #include "sys/dsc.h" DSC_HEADER(email_dsc); -#endif /* __EMAIL_DSC_H__ */ +#endif /* EMAIL_DSC_H_ */ diff --git a/apps/email/email.h b/apps/email/email.h index 64ef9dd28..4d1ce1045 100644 --- a/apps/email/email.h +++ b/apps/email/email.h @@ -31,9 +31,9 @@ * * */ -#ifndef __EMAIL_H__ -#define __EMAIL_H__ +#ifndef EMAIL_H_ +#define EMAIL_H_ PROCESS_NAME(email_process); -#endif /* __EMAIL_H__ */ +#endif /* EMAIL_H_ */ diff --git a/apps/email/smtp.h b/apps/email/smtp.h index e0ea74604..1dbeafd7d 100644 --- a/apps/email/smtp.h +++ b/apps/email/smtp.h @@ -30,8 +30,8 @@ * * */ -#ifndef __SMTP_H__ -#define __SMTP_H__ +#ifndef SMTP_H_ +#define SMTP_H_ #include "contiki-net.h" @@ -60,4 +60,4 @@ void smtp_appcall(void *state); void smtp_init(void); -#endif /* __SMTP_H__ */ +#endif /* SMTP_H_ */ diff --git a/apps/ftp/ftp-dsc.h b/apps/ftp/ftp-dsc.h index b06d7836d..7559b7a74 100644 --- a/apps/ftp/ftp-dsc.h +++ b/apps/ftp/ftp-dsc.h @@ -31,11 +31,11 @@ * * */ -#ifndef __FTP_DSC_H__ -#define __FTP_DSC_H__ +#ifndef FTP_DSC_H_ +#define FTP_DSC_H_ #include "sys/dsc.h" DSC_HEADER(ftp_dsc); -#endif /* __FTP_DSC_H__ */ +#endif /* FTP_DSC_H_ */ diff --git a/apps/ftp/ftp.h b/apps/ftp/ftp.h index a78c96cdf..2f31a5a5f 100644 --- a/apps/ftp/ftp.h +++ b/apps/ftp/ftp.h @@ -31,9 +31,9 @@ * * */ -#ifndef __FTP_H__ -#define __FTP_H__ +#ifndef FTP_H_ +#define FTP_H_ PROCESS_NAME(ftp_process); -#endif /* __FTP_H__ */ +#endif /* FTP_H_ */ diff --git a/apps/ftp/ftpc.h b/apps/ftp/ftpc.h index b8bd4e314..81cf9c2dc 100644 --- a/apps/ftp/ftpc.h +++ b/apps/ftp/ftpc.h @@ -31,8 +31,8 @@ * Author: Adam Dunkels * */ -#ifndef __FTPC_H__ -#define __FTPC_H__ +#ifndef FTPC_H_ +#define FTPC_H_ #include "contiki-net.h" @@ -64,4 +64,4 @@ void ftpc_timedout(void); void ftpc_list_file(char *filename); void ftpc_data(uint8_t *data, uint16_t len); -#endif /* __FTPC_H__ */ +#endif /* FTPC_H_ */ diff --git a/apps/http-post-auth/http-post-auth.h b/apps/http-post-auth/http-post-auth.h index 5204b6430..82242b406 100644 --- a/apps/http-post-auth/http-post-auth.h +++ b/apps/http-post-auth/http-post-auth.h @@ -30,8 +30,8 @@ * */ -#ifndef __HTTP_POST_AUTH_H__ -#define __HTTP_POST_AUTH_H__ +#ifndef HTTP_POST_AUTH_H_ +#define HTTP_POST_AUTH_H_ #include "contiki-net.h" @@ -39,4 +39,4 @@ PROCESS_NAME(http_post_auth_process); int http_post_auth(const uint8_t *username_password, const char *message); -#endif /* __HTTP_POST_AUTH_H__ */ +#endif /* HTTP_POST_AUTH_H_ */ diff --git a/apps/httpd-ws/httpd-ws.h b/apps/httpd-ws/httpd-ws.h index bf60df778..9b6429979 100644 --- a/apps/httpd-ws/httpd-ws.h +++ b/apps/httpd-ws/httpd-ws.h @@ -38,8 +38,8 @@ * Joakim Eriksson */ -#ifndef __HTTPD_WS_H__ -#define __HTTPD_WS_H__ +#ifndef HTTPD_WS_H_ +#define HTTPD_WS_H_ #include "contiki-net.h" @@ -122,4 +122,4 @@ httpd_ws_script_t httpd_ws_get_script(struct httpd_ws_state *s); PROCESS_NAME(httpd_ws_process); -#endif /* __HTTPD_WS_H__ */ +#endif /* HTTPD_WS_H_ */ diff --git a/apps/irc/irc-dsc.h b/apps/irc/irc-dsc.h index a17431965..3f88694d7 100644 --- a/apps/irc/irc-dsc.h +++ b/apps/irc/irc-dsc.h @@ -31,11 +31,11 @@ * * */ -#ifndef __IRC_DSC_H__ -#define __IRC_DSC_H__ +#ifndef IRC_DSC_H_ +#define IRC_DSC_H_ #include "sys/dsc.h" DSC_HEADER(irc_dsc); -#endif /* __IRC_DSC_H__ */ +#endif /* IRC_DSC_H_ */ diff --git a/apps/irc/irc.h b/apps/irc/irc.h index a70a4c22d..cc5eae016 100644 --- a/apps/irc/irc.h +++ b/apps/irc/irc.h @@ -31,9 +31,9 @@ * * */ -#ifndef __IRC_H__ -#define __IRC_H__ +#ifndef IRC_H_ +#define IRC_H_ PROCESS_NAME(irc_process); -#endif /* __IRC_H__ */ +#endif /* IRC_H_ */ diff --git a/apps/irc/ircc.h b/apps/irc/ircc.h index 7f0985fb3..c42860f5e 100644 --- a/apps/irc/ircc.h +++ b/apps/irc/ircc.h @@ -31,8 +31,8 @@ * Author: Adam Dunkels * */ -#ifndef __IRCC_H__ -#define __IRCC_H__ +#ifndef IRCC_H_ +#define IRCC_H_ #include "contiki-net.h" @@ -75,4 +75,4 @@ void ircc_closed(struct ircc_state *s); void ircc_quit(struct ircc_state *s); -#endif /* __IRCC_H__ */ +#endif /* IRCC_H_ */ diff --git a/apps/json/json.h b/apps/json/json.h index 703f6d57c..a698464a5 100644 --- a/apps/json/json.h +++ b/apps/json/json.h @@ -37,8 +37,8 @@ * Joakim Eriksson */ -#ifndef __JSON_H__ -#define __JSON_H__ +#ifndef JSON_H_ +#define JSON_H_ #define JSON_TYPE_ARRAY '[' #define JSON_TYPE_OBJECT '{' @@ -67,4 +67,4 @@ enum { #define JSON_CONTENT_TYPE "application/json" -#endif /* __JSON_H__ */ +#endif /* JSON_H_ */ diff --git a/apps/json/jsonparse.h b/apps/json/jsonparse.h index 3821b67db..419186249 100644 --- a/apps/json/jsonparse.h +++ b/apps/json/jsonparse.h @@ -29,8 +29,8 @@ * This file is part of the Contiki operating system. */ -#ifndef __JSONPARSE_H__ -#define __JSONPARSE_H__ +#ifndef JSONPARSE_H_ +#define JSONPARSE_H_ #include "contiki-conf.h" #include "json.h" @@ -88,4 +88,4 @@ int jsonparse_get_type(struct jsonparse_state *state); /* compare the JSON value with the specified string */ int jsonparse_strcmp_value(struct jsonparse_state *state, const char *str); -#endif /* __JSONPARSE_H__ */ +#endif /* JSONPARSE_H_ */ diff --git a/apps/json/jsontree.h b/apps/json/jsontree.h index 8e2a11243..476487183 100644 --- a/apps/json/jsontree.h +++ b/apps/json/jsontree.h @@ -37,8 +37,8 @@ * Joakim Eriksson */ -#ifndef __JSONTREE_H__ -#define __JSONTREE_H__ +#ifndef JSONTREE_H_ +#define JSONTREE_H_ #include "contiki-conf.h" #include "json.h" @@ -132,4 +132,4 @@ int jsontree_print_next(struct jsontree_context *js_ctx); struct jsontree_value *jsontree_find_next(struct jsontree_context *js_ctx, int type); -#endif /* __JSONTREE_H__ */ +#endif /* JSONTREE_H_ */ diff --git a/apps/netconf/netconf-dsc.h b/apps/netconf/netconf-dsc.h index 8cd788cdd..1e573ef61 100644 --- a/apps/netconf/netconf-dsc.h +++ b/apps/netconf/netconf-dsc.h @@ -31,11 +31,11 @@ * * */ -#ifndef __NETCONF_DSC_H__ -#define __NETCONF_DSC_H__ +#ifndef NETCONF_DSC_H_ +#define NETCONF_DSC_H_ #include "sys/dsc.h" DSC_HEADER(netconf_dsc); -#endif /* __NETCONF_DSC_H__ */ +#endif /* NETCONF_DSC_H_ */ diff --git a/apps/ping6/ping6.h b/apps/ping6/ping6.h index 9f3c017b2..0640b16f6 100644 --- a/apps/ping6/ping6.h +++ b/apps/ping6/ping6.h @@ -1,8 +1,8 @@ -#ifndef __PING6_H__ -#define __PING6_H__ +#ifndef PING6_H_ +#define PING6_H_ #include "contiki.h" PROCESS_NAME(ping6_process); -#endif /* __PING6_H__ */ +#endif /* PING6_H_ */ diff --git a/apps/process-list/process-list-dsc.h b/apps/process-list/process-list-dsc.h index 82d5f8495..c8af0af36 100644 --- a/apps/process-list/process-list-dsc.h +++ b/apps/process-list/process-list-dsc.h @@ -31,11 +31,11 @@ * * */ -#ifndef __PROCESSES_DSC_H__ -#define __PROCESSES_DSC_H__ +#ifndef PROCESSES_DSC_H_ +#define PROCESSES_DSC_H_ #include "sys/dsc.h" DSC_HEADER(processes_dsc); -#endif /* __PROCESSES_DSC_H__ */ +#endif /* PROCESSES_DSC_H_ */ diff --git a/apps/program-handler/program-handler.h b/apps/program-handler/program-handler.h index 855b614b3..463199993 100644 --- a/apps/program-handler/program-handler.h +++ b/apps/program-handler/program-handler.h @@ -31,8 +31,8 @@ * * */ -#ifndef __PROGRAM_HANDLER_H__ -#define __PROGRAM_HANDLER_H__ +#ifndef PROGRAM_HANDLER_H_ +#define PROGRAM_HANDLER_H_ #include "sys/dsc.h" @@ -48,4 +48,4 @@ void program_handler_setscreensaver(char *name); void program_handler_add(struct dsc *dsc, char *menuname, unsigned char desktop); -#endif /* __PROGRAM_HANDLER_H__ */ +#endif /* PROGRAM_HANDLER_H_ */ diff --git a/apps/serial-shell/serial-shell.h b/apps/serial-shell/serial-shell.h index 1ee638629..d00dee489 100644 --- a/apps/serial-shell/serial-shell.h +++ b/apps/serial-shell/serial-shell.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SERIAL_SHELL_H__ -#define __SERIAL_SHELL_H__ +#ifndef SERIAL_SHELL_H_ +#define SERIAL_SHELL_H_ #include "contiki.h" void serial_shell_init(void); -#endif /* __SERIAL_SHELL_H__ */ +#endif /* SERIAL_SHELL_H_ */ diff --git a/apps/shell/shell-base64.h b/apps/shell/shell-base64.h index 9d4eeabe4..8b55ddf6b 100644 --- a/apps/shell/shell-base64.h +++ b/apps/shell/shell-base64.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_BASE64_H__ -#define __SHELL_BASE64_H__ +#ifndef SHELL_BASE64_H_ +#define SHELL_BASE64_H_ #include "shell.h" void shell_base64_init(void); -#endif /* __SHELL_BASE64_H__ */ +#endif /* SHELL_BASE64_H_ */ diff --git a/apps/shell/shell-blink.h b/apps/shell/shell-blink.h index 24547408d..34dadf417 100644 --- a/apps/shell/shell-blink.h +++ b/apps/shell/shell-blink.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_BLINK_H__ -#define __SHELL_BLINK_H__ +#ifndef SHELL_BLINK_H_ +#define SHELL_BLINK_H_ #include "shell.h" void shell_blink_init(void); -#endif /* __SHELL_BLINK_H__ */ +#endif /* SHELL_BLINK_H_ */ diff --git a/apps/shell/shell-checkpoint.h b/apps/shell/shell-checkpoint.h index 3ba06b6fd..61a57e53e 100644 --- a/apps/shell/shell-checkpoint.h +++ b/apps/shell/shell-checkpoint.h @@ -30,11 +30,11 @@ * */ -#ifndef __SHELL_CHECKPOINT_H__ -#define __SHELL_CHECKPOINT_H__ +#ifndef SHELL_CHECKPOINT_H_ +#define SHELL_CHECKPOINT_H_ #include "shell.h" void shell_checkpoint_init(void); -#endif /* __SHELL_CHECKPOINT_H__ */ +#endif /* SHELL_CHECKPOINT_H_ */ diff --git a/apps/shell/shell-coffee.h b/apps/shell/shell-coffee.h index a9496cf4f..37144274c 100644 --- a/apps/shell/shell-coffee.h +++ b/apps/shell/shell-coffee.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_COFFEE_H__ -#define __SHELL_COFFEE_H__ +#ifndef SHELL_COFFEE_H_ +#define SHELL_COFFEE_H_ #include "shell.h" void shell_coffee_init(void); -#endif /* __SHELL_COFFEE_H__ */ +#endif /* SHELL_COFFEE_H_ */ diff --git a/apps/shell/shell-crc.h b/apps/shell/shell-crc.h index c7fd1574e..a99dc9795 100644 --- a/apps/shell/shell-crc.h +++ b/apps/shell/shell-crc.h @@ -29,11 +29,11 @@ * This file is part of the Contiki operating system. */ -#ifndef __SHELL_CRC_H__ -#define __SHELL_CRC_H__ +#ifndef SHELL_CRC_H_ +#define SHELL_CRC_H_ #include "shell.h" void shell_crc_init(void); -#endif /* __SHELL_CRC_H__ */ +#endif /* SHELL_CRC_H_ */ diff --git a/apps/shell/shell-download.h b/apps/shell/shell-download.h index bed99e157..c8f6a61e3 100644 --- a/apps/shell/shell-download.h +++ b/apps/shell/shell-download.h @@ -30,11 +30,11 @@ * */ -#ifndef __SHELL_DOWNLOAD_H__ -#define __SHELL_DOWNLOAD_H__ +#ifndef SHELL_DOWNLOAD_H_ +#define SHELL_DOWNLOAD_H_ #include "shell.h" void shell_download_init(void); -#endif /* __SHELL_DOWNLOAD_H__ */ +#endif /* SHELL_DOWNLOAD_H_ */ diff --git a/apps/shell/shell-dsc.h b/apps/shell/shell-dsc.h index 90e6c5507..7fa4edc62 100644 --- a/apps/shell/shell-dsc.h +++ b/apps/shell/shell-dsc.h @@ -31,11 +31,11 @@ * * */ -#ifndef __SHELL_DSC_H__ -#define __SHELL_DSC_H__ +#ifndef SHELL_DSC_H_ +#define SHELL_DSC_H_ #include "sys/dsc.h" DSC_HEADER(shell_dsc); -#endif /* __SHELL_DSC_H__ */ +#endif /* SHELL_DSC_H_ */ diff --git a/apps/shell/shell-exec.h b/apps/shell/shell-exec.h index bcc100d17..e748e3806 100644 --- a/apps/shell/shell-exec.h +++ b/apps/shell/shell-exec.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_EXEC_H__ -#define __SHELL_EXEC_H__ +#ifndef SHELL_EXEC_H_ +#define SHELL_EXEC_H_ #include "shell.h" void shell_exec_init(void); -#endif /* __SHELL_EXEC_H__ */ +#endif /* SHELL_EXEC_H_ */ diff --git a/apps/shell/shell-file.h b/apps/shell/shell-file.h index 0e3560306..625ce0ca4 100644 --- a/apps/shell/shell-file.h +++ b/apps/shell/shell-file.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_FILE_H__ -#define __SHELL_FILE_H__ +#ifndef SHELL_FILE_H_ +#define SHELL_FILE_H_ #include "shell.h" void shell_file_init(void); -#endif /* __SHELL_FILE_H__ */ +#endif /* SHELL_FILE_H_ */ diff --git a/apps/shell/shell-httpd.h b/apps/shell/shell-httpd.h index 4ce71cc0d..c527816c2 100644 --- a/apps/shell/shell-httpd.h +++ b/apps/shell/shell-httpd.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_HTTPD_H__ -#define __SHELL_HTTPD_H__ +#ifndef SHELL_HTTPD_H_ +#define SHELL_HTTPD_H_ #include "shell.h" void shell_httpd_init(void); -#endif /* __SHELL_HTTPD_H__ */ +#endif /* SHELL_HTTPD_H_ */ diff --git a/apps/shell/shell-irc.h b/apps/shell/shell-irc.h index 8190d2a41..8b68096e5 100644 --- a/apps/shell/shell-irc.h +++ b/apps/shell/shell-irc.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_IRC_H__ -#define __SHELL_IRC_H__ +#ifndef SHELL_IRC_H_ +#define SHELL_IRC_H_ #include "shell.h" void shell_irc_init(void); -#endif /* __SHELL_IRC_H__ */ +#endif /* SHELL_IRC_H_ */ diff --git a/apps/shell/shell-memdebug.h b/apps/shell/shell-memdebug.h index a9361a7a8..7aa7f3389 100644 --- a/apps/shell/shell-memdebug.h +++ b/apps/shell/shell-memdebug.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_MEMDEBUG_H__ -#define __SHELL_MEMDEBUG_H__ +#ifndef SHELL_MEMDEBUG_H_ +#define SHELL_MEMDEBUG_H_ #include "shell.h" void shell_memdebug_init(void); -#endif /* __SHELL_MEMDEBUG_H__ */ +#endif /* SHELL_MEMDEBUG_H_ */ diff --git a/apps/shell/shell-netfile.h b/apps/shell/shell-netfile.h index e87a714bb..2cbe362f0 100644 --- a/apps/shell/shell-netfile.h +++ b/apps/shell/shell-netfile.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_NETFILE_H__ -#define __SHELL_NETFILE_H__ +#ifndef SHELL_NETFILE_H_ +#define SHELL_NETFILE_H_ #include "shell.h" void shell_netfile_init(void); -#endif /* __SHELL_NETFILE_H__ */ +#endif /* SHELL_NETFILE_H_ */ diff --git a/apps/shell/shell-netperf.h b/apps/shell/shell-netperf.h index 25cd55586..0dd3ecb35 100644 --- a/apps/shell/shell-netperf.h +++ b/apps/shell/shell-netperf.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_NETPERF_H__ -#define __SHELL_NETPERF_H__ +#ifndef SHELL_NETPERF_H_ +#define SHELL_NETPERF_H_ #include "shell.h" void shell_netperf_init(void); -#endif /* __SHELL_NETPERF_H__ */ +#endif /* SHELL_NETPERF_H_ */ diff --git a/apps/shell/shell-netstat.h b/apps/shell/shell-netstat.h index 256ab6f28..ee122b8ab 100644 --- a/apps/shell/shell-netstat.h +++ b/apps/shell/shell-netstat.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_NETSTAT_H__ -#define __SHELL_NETSTAT_H__ +#ifndef SHELL_NETSTAT_H_ +#define SHELL_NETSTAT_H_ #include "shell.h" void shell_netstat_init(void); -#endif /* __SHELL_NETSTAT_H__ */ +#endif /* SHELL_NETSTAT_H_ */ diff --git a/apps/shell/shell-ping.h b/apps/shell/shell-ping.h index b77b8f1af..0aaad4144 100644 --- a/apps/shell/shell-ping.h +++ b/apps/shell/shell-ping.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_PING_H__ -#define __SHELL_PING_H__ +#ifndef SHELL_PING_H_ +#define SHELL_PING_H_ #include "shell.h" void shell_ping_init(void); -#endif /* __SHELL_PING_H__ */ +#endif /* SHELL_PING_H_ */ diff --git a/apps/shell/shell-power.h b/apps/shell/shell-power.h index e4f89f9d6..568594252 100644 --- a/apps/shell/shell-power.h +++ b/apps/shell/shell-power.h @@ -37,9 +37,9 @@ * Adam Dunkels */ -#ifndef __SHELL_POWER_H__ -#define __SHELL_POWER_H__ +#ifndef SHELL_POWER_H_ +#define SHELL_POWER_H_ void shell_power_init(void); -#endif /* __SHELL_POWER_H__ */ +#endif /* SHELL_POWER_H_ */ diff --git a/apps/shell/shell-profile.h b/apps/shell/shell-profile.h index 202a6036f..337a02b34 100644 --- a/apps/shell/shell-profile.h +++ b/apps/shell/shell-profile.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_PROFILE_H__ -#define __SHELL_PROFILE_H__ +#ifndef SHELL_PROFILE_H_ +#define SHELL_PROFILE_H_ #include "shell.h" void shell_profile_init(void); -#endif /* __SHELL_PROFILE_H__ */ +#endif /* SHELL_PROFILE_H_ */ diff --git a/apps/shell/shell-ps.h b/apps/shell/shell-ps.h index c8437a8b2..e80499fc4 100644 --- a/apps/shell/shell-ps.h +++ b/apps/shell/shell-ps.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_PS_H__ -#define __SHELL_PS_H__ +#ifndef SHELL_PS_H_ +#define SHELL_PS_H_ #include "shell.h" void shell_ps_init(void); -#endif /* __SHELL_PS_H__ */ +#endif /* SHELL_PS_H_ */ diff --git a/apps/shell/shell-reboot.h b/apps/shell/shell-reboot.h index 6761dccb6..6265a4d6f 100644 --- a/apps/shell/shell-reboot.h +++ b/apps/shell/shell-reboot.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_REBOOT_H__ -#define __SHELL_REBOOT_H__ +#ifndef SHELL_REBOOT_H_ +#define SHELL_REBOOT_H_ #include "shell.h" void shell_reboot_init(void); -#endif /* __SHELL_REBOOT_H__ */ +#endif /* SHELL_REBOOT_H_ */ diff --git a/apps/shell/shell-rime-debug-runicast.h b/apps/shell/shell-rime-debug-runicast.h index a8e54e105..050ebe6e6 100644 --- a/apps/shell/shell-rime-debug-runicast.h +++ b/apps/shell/shell-rime-debug-runicast.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_RIME_DEBUG_RUNICAST_H__ -#define __SHELL_RIME_DEBUG_RUNICAST_H__ +#ifndef SHELL_RIME_DEBUG_RUNICAST_H_ +#define SHELL_RIME_DEBUG_RUNICAST_H_ #include "shell.h" void shell_rime_debug_runicast_init(void); -#endif /* __SHELL_RIME_DEBUG_RUNICAST_H__ */ +#endif /* SHELL_RIME_DEBUG_RUNICAST_H_ */ diff --git a/apps/shell/shell-rime-debug.h b/apps/shell/shell-rime-debug.h index d19521b05..5764ce72c 100644 --- a/apps/shell/shell-rime-debug.h +++ b/apps/shell/shell-rime-debug.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_RIME_DEBUG_H__ -#define __SHELL_RIME_DEBUG_H__ +#ifndef SHELL_RIME_DEBUG_H_ +#define SHELL_RIME_DEBUG_H_ #include "shell.h" void shell_rime_debug_init(void); -#endif /* __SHELL_RIME_DEBUG_H__ */ +#endif /* SHELL_RIME_DEBUG_H_ */ diff --git a/apps/shell/shell-rime-neighbors.h b/apps/shell/shell-rime-neighbors.h index 6929b3a70..e10905e5b 100644 --- a/apps/shell/shell-rime-neighbors.h +++ b/apps/shell/shell-rime-neighbors.h @@ -37,9 +37,9 @@ * Adam Dunkels */ -#ifndef __SHELL_RIME_NEIGHBORS_H__ -#define __SHELL_RIME_NEIGHBORS_H__ +#ifndef SHELL_RIME_NEIGHBORS_H_ +#define SHELL_RIME_NEIGHBORS_H_ void shell_rime_neighbors_init(void); -#endif /* __SHELL-RIME_-NEIGHBORS_H__ */ +#endif /* SHELL-RIME_-NEIGHBORS_H_ */ diff --git a/apps/shell/shell-rime-netcmd.h b/apps/shell/shell-rime-netcmd.h index c21da643b..015d4052a 100644 --- a/apps/shell/shell-rime-netcmd.h +++ b/apps/shell/shell-rime-netcmd.h @@ -37,9 +37,9 @@ * Adam Dunkels */ -#ifndef __SHELL_RIME_NETCMD_H__ -#define __SHELL_RIME_NETCMD_H__ +#ifndef SHELL_RIME_NETCMD_H_ +#define SHELL_RIME_NETCMD_H_ void shell_rime_netcmd_init(void); -#endif /* __SHELL_RIME_NETCMD_H__ */ +#endif /* SHELL_RIME_NETCMD_H_ */ diff --git a/apps/shell/shell-rime-ping.h b/apps/shell/shell-rime-ping.h index e807aa757..17ca01a95 100644 --- a/apps/shell/shell-rime-ping.h +++ b/apps/shell/shell-rime-ping.h @@ -37,9 +37,9 @@ * Adam Dunkels */ -#ifndef __SHELL_RIME_PING_H__ -#define __SHELL_RIME_PING_H__ +#ifndef SHELL_RIME_PING_H_ +#define SHELL_RIME_PING_H_ void shell_rime_ping_init(void); -#endif /* __SHELL-RIME_-PING_H__ */ +#endif /* SHELL-RIME_-PING_H_ */ diff --git a/apps/shell/shell-rime-sendcmd.h b/apps/shell/shell-rime-sendcmd.h index e24d797ec..09be3a511 100644 --- a/apps/shell/shell-rime-sendcmd.h +++ b/apps/shell/shell-rime-sendcmd.h @@ -30,9 +30,9 @@ * */ -#ifndef __SHELL_RIME_SENDCMD_H__ -#define __SHELL_RIME_SENDCMD_H__ +#ifndef SHELL_RIME_SENDCMD_H_ +#define SHELL_RIME_SENDCMD_H_ void shell_rime_sendcmd_init(void); -#endif /* __SHELL_RIME_SENDCMD_H__ */ +#endif /* SHELL_RIME_SENDCMD_H_ */ diff --git a/apps/shell/shell-rime-sniff.h b/apps/shell/shell-rime-sniff.h index de0369e63..7bbe83f56 100644 --- a/apps/shell/shell-rime-sniff.h +++ b/apps/shell/shell-rime-sniff.h @@ -37,9 +37,9 @@ * Adam Dunkels */ -#ifndef __SHELL_RIME_SNIFF_H__ -#define __SHELL_RIME_SNIFF_H__ +#ifndef SHELL_RIME_SNIFF_H_ +#define SHELL_RIME_SNIFF_H_ void shell_rime_sniff_init(void); -#endif /* __SHELL_RIME_SNIFF_H__ */ +#endif /* SHELL_RIME_SNIFF_H_ */ diff --git a/apps/shell/shell-rime-unicast.h b/apps/shell/shell-rime-unicast.h index bfec89209..6661bd960 100644 --- a/apps/shell/shell-rime-unicast.h +++ b/apps/shell/shell-rime-unicast.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_RIME_UNICAST_H__ -#define __SHELL_RIME_UNICAST_H__ +#ifndef SHELL_RIME_UNICAST_H_ +#define SHELL_RIME_UNICAST_H_ #include "shell.h" void shell_rime_unicast_init(void); -#endif /* __SHELL_RIME_UNICAST_H__ */ +#endif /* SHELL_RIME_UNICAST_H_ */ diff --git a/apps/shell/shell-rime.h b/apps/shell/shell-rime.h index 86be38c8a..b22d4a648 100644 --- a/apps/shell/shell-rime.h +++ b/apps/shell/shell-rime.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __SHELL_RIME_H__ -#define __SHELL_RIME_H__ +#ifndef SHELL_RIME_H_ +#define SHELL_RIME_H_ #include "shell.h" @@ -86,4 +86,4 @@ void shell_rime_init(void); extern struct collect_conn shell_collect_conn; -#endif /* __SHELL_RIME_H__ */ +#endif /* SHELL_RIME_H_ */ diff --git a/apps/shell/shell-rsh.h b/apps/shell/shell-rsh.h index 2bfd75305..03e69a922 100644 --- a/apps/shell/shell-rsh.h +++ b/apps/shell/shell-rsh.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_RSH_H__ -#define __SHELL_RSH_H__ +#ifndef SHELL_RSH_H_ +#define SHELL_RSH_H_ #include "shell.h" void shell_rsh_init(void); -#endif /* __SHELL_RSH_H__ */ +#endif /* SHELL_RSH_H_ */ diff --git a/apps/shell/shell-run.h b/apps/shell/shell-run.h index cd6e00953..b8a98f996 100644 --- a/apps/shell/shell-run.h +++ b/apps/shell/shell-run.h @@ -30,11 +30,11 @@ * */ -#ifndef __SHELL_RUN_H__ -#define __SHELL_RUN_H__ +#ifndef SHELL_RUN_H_ +#define SHELL_RUN_H_ #include "shell.h" void shell_run_init(void); -#endif /* __SHELL_RUN_H__ */ +#endif /* SHELL_RUN_H_ */ diff --git a/apps/shell/shell-sendtest.h b/apps/shell/shell-sendtest.h index 9a15c12a1..0bdd3e57f 100644 --- a/apps/shell/shell-sendtest.h +++ b/apps/shell/shell-sendtest.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_SENDTEST_H__ -#define __SHELL_SENDTEST_H__ +#ifndef SHELL_SENDTEST_H_ +#define SHELL_SENDTEST_H_ #include "shell.h" void shell_sendtest_init(void); -#endif /* __SHELL_SENDTEST_H__ */ +#endif /* SHELL_SENDTEST_H_ */ diff --git a/apps/shell/shell-sky.h b/apps/shell/shell-sky.h index 3f962c798..9af21c4fe 100644 --- a/apps/shell/shell-sky.h +++ b/apps/shell/shell-sky.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_SKY_H__ -#define __SHELL_SKY_H__ +#ifndef SHELL_SKY_H_ +#define SHELL_SKY_H_ #include "shell.h" void shell_sky_init(void); -#endif /* __SHELL_SKY_H__ */ +#endif /* SHELL_SKY_H_ */ diff --git a/apps/shell/shell-tcpsend.h b/apps/shell/shell-tcpsend.h index 867fb0552..f5f813b02 100644 --- a/apps/shell/shell-tcpsend.h +++ b/apps/shell/shell-tcpsend.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_TCPSEND_H__ -#define __SHELL_TCPSEND_H__ +#ifndef SHELL_TCPSEND_H_ +#define SHELL_TCPSEND_H_ #include "shell.h" void shell_tcpsend_init(void); -#endif /* __SHELL_TCPSEND_H__ */ +#endif /* SHELL_TCPSEND_H_ */ diff --git a/apps/shell/shell-text.h b/apps/shell/shell-text.h index 71705f030..b559d569c 100644 --- a/apps/shell/shell-text.h +++ b/apps/shell/shell-text.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_TEXT_H__ -#define __SHELL_TEXT_H__ +#ifndef SHELL_TEXT_H_ +#define SHELL_TEXT_H_ #include "shell.h" void shell_text_init(void); -#endif /* __SHELL_TEXT_H__ */ +#endif /* SHELL_TEXT_H_ */ diff --git a/apps/shell/shell-time.h b/apps/shell/shell-time.h index 85b4bffe6..c7c67c54b 100644 --- a/apps/shell/shell-time.h +++ b/apps/shell/shell-time.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_TIME_H__ -#define __SHELL_TIME_H__ +#ifndef SHELL_TIME_H_ +#define SHELL_TIME_H_ #include "shell.h" void shell_time_init(void); -#endif /* __SHELL_TIME_H__ */ +#endif /* SHELL_TIME_H_ */ diff --git a/apps/shell/shell-udpsend.h b/apps/shell/shell-udpsend.h index 92a26cbe9..a33036584 100644 --- a/apps/shell/shell-udpsend.h +++ b/apps/shell/shell-udpsend.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_UDPSEND_H__ -#define __SHELL_UDPSEND_H__ +#ifndef SHELL_UDPSEND_H_ +#define SHELL_UDPSEND_H_ #include "shell.h" void shell_udpsend_init(void); -#endif /* __SHELL_UDPSEND_H__ */ +#endif /* SHELL_UDPSEND_H_ */ diff --git a/apps/shell/shell-vars.h b/apps/shell/shell-vars.h index 72d720872..07e8a9f73 100644 --- a/apps/shell/shell-vars.h +++ b/apps/shell/shell-vars.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_VARS_H__ -#define __SHELL_VARS_H__ +#ifndef SHELL_VARS_H_ +#define SHELL_VARS_H_ #include "shell.h" void shell_vars_init(void); -#endif /* __SHELL_VARS_H__ */ +#endif /* SHELL_VARS_H_ */ diff --git a/apps/shell/shell-wget.h b/apps/shell/shell-wget.h index 2a97113cd..9d1ed0254 100644 --- a/apps/shell/shell-wget.h +++ b/apps/shell/shell-wget.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __SHELL_WGET_H__ -#define __SHELL_WGET_H__ +#ifndef SHELL_WGET_H_ +#define SHELL_WGET_H_ #include "shell.h" void shell_wget_init(void); -#endif /* __SHELL_WGET_H__ */ +#endif /* SHELL_WGET_H_ */ diff --git a/apps/shell/shell.h b/apps/shell/shell.h index 7d955b303..0ce566475 100644 --- a/apps/shell/shell.h +++ b/apps/shell/shell.h @@ -57,8 +57,8 @@ * Adam Dunkels */ -#ifndef __SHELL_H__ -#define __SHELL_H__ +#ifndef SHELL_H_ +#define SHELL_H_ #include "sys/process.h" @@ -411,7 +411,7 @@ struct shell_input { #include "shell-vars.h" #include "shell-wget.h" -#endif /* __SHELL_H__ */ +#endif /* SHELL_H_ */ /** @} */ diff --git a/apps/slip-cmd/cmd.h b/apps/slip-cmd/cmd.h index 078e95041..d363ac933 100644 --- a/apps/slip-cmd/cmd.h +++ b/apps/slip-cmd/cmd.h @@ -35,8 +35,8 @@ * Joakim Eriksson */ -#ifndef __CMD_H__ -#define __CMD_H__ +#ifndef CMD_H_ +#define CMD_H_ #include "contiki.h" @@ -50,4 +50,4 @@ const cmd_handler_t cmd_handlers[] = {__VA_ARGS__, NULL} void cmd_input(const uint8_t *data, int data_len); void cmd_send(const uint8_t *data, int data_len); -#endif /* __CMD_H__ */ +#endif /* CMD_H_ */ diff --git a/apps/slip-cmd/packetutils.h b/apps/slip-cmd/packetutils.h index 4e3af02f7..09ae4ed15 100644 --- a/apps/slip-cmd/packetutils.h +++ b/apps/slip-cmd/packetutils.h @@ -27,11 +27,11 @@ * SUCH DAMAGE. */ -#ifndef __PACKETUTILS_H__ -#define __PACKETUTILS_H__ +#ifndef PACKETUTILS_H_ +#define PACKETUTILS_H_ int packetutils_serialize_atts(uint8_t *data, int size); int packetutils_deserialize_atts(const uint8_t *data, int size); -#endif /* __PACKETUTILS_H__ */ +#endif /* PACKETUTILS_H_ */ diff --git a/apps/telnet/simpletelnet.h b/apps/telnet/simpletelnet.h index 6eb09bdb7..6b55b1669 100644 --- a/apps/telnet/simpletelnet.h +++ b/apps/telnet/simpletelnet.h @@ -31,8 +31,8 @@ * * */ -#ifndef __SIMPLETELNET_H__ -#define __SIMPLETELNET_H__ +#ifndef SIMPLETELNET_H_ +#define SIMPLETELNET_H_ #ifdef TELNET_CONF_WINDOW_WIDTH #define TELNET_WINDOW_WIDTH TELNET_CONF_WINDOW_WIDTH @@ -63,4 +63,4 @@ void simpletelnet_init(char *arg); -#endif /* __SIMPLETELNET_H__ */ +#endif /* SIMPLETELNET_H_ */ diff --git a/apps/telnet/telnet-dsc.h b/apps/telnet/telnet-dsc.h index e32e3e698..4cee9bed8 100644 --- a/apps/telnet/telnet-dsc.h +++ b/apps/telnet/telnet-dsc.h @@ -31,11 +31,11 @@ * * */ -#ifndef __TELNET_DSC_H__ -#define __TELNET_DSC_H__ +#ifndef TELNET_DSC_H_ +#define TELNET_DSC_H_ #include "sys/dsc.h" DSC_HEADER(telnet_dsc); -#endif /* __TELNET_DSC_H__ */ +#endif /* TELNET_DSC_H_ */ diff --git a/apps/telnet/telnet.h b/apps/telnet/telnet.h index 482d7f934..a9aaf7e65 100644 --- a/apps/telnet/telnet.h +++ b/apps/telnet/telnet.h @@ -30,8 +30,8 @@ * * */ -#ifndef __TELNET_H__ -#define __TELNET_H__ +#ifndef TELNET_H_ +#define TELNET_H_ #include "contiki-net.h" @@ -57,4 +57,4 @@ void telnet_sent(struct telnet_state *s); void telnet_aborted(struct telnet_state *s); void telnet_timedout(struct telnet_state *s); void telnet_newdata(struct telnet_state *s, char *data, uint16_t len); -#endif /* __TELNET_H__ */ +#endif /* TELNET_H_ */ diff --git a/apps/telnetd/telnetd-dsc.h b/apps/telnetd/telnetd-dsc.h index 01389ce61..143d58800 100644 --- a/apps/telnetd/telnetd-dsc.h +++ b/apps/telnetd/telnetd-dsc.h @@ -31,11 +31,11 @@ * * */ -#ifndef __TELNETD_DSC_H__ -#define __TELNETD_DSC_H__ +#ifndef TELNETD_DSC_H_ +#define TELNETD_DSC_H_ #include "sys/dsc.h" DSC_HEADER(telnetd_dsc); -#endif /* __TELNETD_DSC_H__ */ +#endif /* TELNETD_DSC_H_ */ diff --git a/apps/telnetd/telnetd.h b/apps/telnetd/telnetd.h index 9db26ebec..ddae0b051 100644 --- a/apps/telnetd/telnetd.h +++ b/apps/telnetd/telnetd.h @@ -31,8 +31,8 @@ * * */ -#ifndef __TELNETD_H__ -#define __TELNETD_H__ +#ifndef TELNETD_H_ +#define TELNETD_H_ #include "contiki.h" @@ -47,4 +47,4 @@ void telnetd_gui_output(const char *str1, int len1, const char *str2, int len2); void telnetd_gui_quit(void); void telnetd_quit(void); -#endif /* __TELNETD_H__ */ +#endif /* TELNETD_H_ */ diff --git a/apps/vnc/vnc-draw.h b/apps/vnc/vnc-draw.h index e8a253396..f9fddd8e0 100644 --- a/apps/vnc/vnc-draw.h +++ b/apps/vnc/vnc-draw.h @@ -32,8 +32,8 @@ * */ -#ifndef __VNC_DRAW_H__ -#define __VNC_DRAW_H__ +#ifndef VNC_DRAW_H_ +#define VNC_DRAW_H_ #include "net/uip_arch.h" @@ -57,4 +57,4 @@ uint16_t vnc_draw_viewport_y(void); uint16_t vnc_draw_viewport_w(void); uint16_t vnc_draw_viewport_h(void); -#endif /* __VNC_DRAW_H__ */ +#endif /* VNC_DRAW_H_ */ diff --git a/apps/vnc/vnc-dsc.h b/apps/vnc/vnc-dsc.h index e55d8dfd6..74e5351a8 100644 --- a/apps/vnc/vnc-dsc.h +++ b/apps/vnc/vnc-dsc.h @@ -31,11 +31,11 @@ * * */ -#ifndef __VNC_DSC_H__ -#define __VNC_DSC_H__ +#ifndef VNC_DSC_H_ +#define VNC_DSC_H_ #include "sys/dsc.h" DSC_HEADER(vnc_dsc); -#endif /* __VNC_DSC_H__ */ +#endif /* VNC_DSC_H_ */ diff --git a/apps/vnc/vnc-viewer.h b/apps/vnc/vnc-viewer.h index a2e9176c8..08600efc4 100644 --- a/apps/vnc/vnc-viewer.h +++ b/apps/vnc/vnc-viewer.h @@ -32,8 +32,8 @@ * */ -#ifndef __VNC_VIEWER_H__ -#define __VNC_VIEWER_H__ +#ifndef VNC_VIEWER_H_ +#define VNC_VIEWER_H_ struct vnc_viewer_state; @@ -323,4 +323,4 @@ struct rfb_pointer_event { uint16_t y; }; -#endif /* __VNC_VIEWER_H__ */ +#endif /* VNC_VIEWER_H_ */ diff --git a/apps/vnc/vnc.h b/apps/vnc/vnc.h index 5be0ff890..a872292a5 100644 --- a/apps/vnc/vnc.h +++ b/apps/vnc/vnc.h @@ -31,9 +31,9 @@ * * */ -#ifndef __VNC_H__ -#define __VNC_H__ +#ifndef VNC_H_ +#define VNC_H_ void vnc_init(char *arg); -#endif /* __VNC_H__ */ +#endif /* VNC_H_ */ diff --git a/apps/webbrowser/htmlparser.h b/apps/webbrowser/htmlparser.h index a42d43c18..233c94e5b 100644 --- a/apps/webbrowser/htmlparser.h +++ b/apps/webbrowser/htmlparser.h @@ -31,8 +31,8 @@ * * */ -#ifndef __HTMLPARSER_H__ -#define __HTMLPARSER_H__ +#ifndef HTMLPARSER_H_ +#define HTMLPARSER_H_ #include "contiki-net.h" @@ -62,4 +62,4 @@ void htmlparser_init(void); void htmlparser_parse(char *data, uint16_t len); -#endif /* __HTMLPARSER_H__ */ +#endif /* HTMLPARSER_H_ */ diff --git a/apps/webbrowser/webclient.h b/apps/webbrowser/webclient.h index 2be57aa9c..c8b1b8b00 100644 --- a/apps/webbrowser/webclient.h +++ b/apps/webbrowser/webclient.h @@ -31,8 +31,8 @@ * * */ -#ifndef __WEBCLIENT_H__ -#define __WEBCLIENT_H__ +#ifndef WEBCLIENT_H_ +#define WEBCLIENT_H_ #include "contiki-net.h" #include "http-strings.h" @@ -62,4 +62,4 @@ char *webclient_filename(void); char *webclient_hostname(void); unsigned short webclient_port(void); -#endif /* __WEBCLIENT_H__ */ +#endif /* WEBCLIENT_H_ */ diff --git a/apps/webbrowser/www-dsc.h b/apps/webbrowser/www-dsc.h index ee2046735..15ed64792 100644 --- a/apps/webbrowser/www-dsc.h +++ b/apps/webbrowser/www-dsc.h @@ -31,11 +31,11 @@ * * */ -#ifndef __WWW_DSC_H__ -#define __WWW_DSC_H__ +#ifndef WWW_DSC_H_ +#define WWW_DSC_H_ #include "sys/dsc.h" DSC_HEADER(www_dsc); -#endif /* __WWW_DSC_H__ */ +#endif /* WWW_DSC_H_ */ diff --git a/apps/webbrowser/www.h b/apps/webbrowser/www.h index b5becc5c8..d7ffd6fd6 100644 --- a/apps/webbrowser/www.h +++ b/apps/webbrowser/www.h @@ -31,8 +31,8 @@ * * */ -#ifndef __WWW_H__ -#define __WWW_H__ +#ifndef WWW_H_ +#define WWW_H_ #ifndef WWW_CONF_WEBPAGE_WIDTH #define WWW_CONF_WEBPAGE_WIDTH 80 @@ -64,4 +64,4 @@ PROCESS_NAME(www_process); -#endif /* __WWW_H__ */ +#endif /* WWW_H_ */ diff --git a/apps/webserver-nano/httpd-cfs.h b/apps/webserver-nano/httpd-cfs.h index f99e2271d..fabf3fd76 100644 --- a/apps/webserver-nano/httpd-cfs.h +++ b/apps/webserver-nano/httpd-cfs.h @@ -31,8 +31,8 @@ * */ -#ifndef __HTTPD_CFS_H__ -#define __HTTPD_CFS_H__ +#ifndef HTTPD_CFS_H_ +#define HTTPD_CFS_H_ #include "contiki-net.h" @@ -58,4 +58,4 @@ struct httpd_state { void httpd_init(void); void httpd_appcall(void *state); -#endif /* __HTTPD_CFS_H__ */ +#endif /* HTTPD_CFS_H_ */ diff --git a/apps/webserver-nano/httpd-cgi.h b/apps/webserver-nano/httpd-cgi.h index 21b337a82..db32f6fef 100644 --- a/apps/webserver-nano/httpd-cgi.h +++ b/apps/webserver-nano/httpd-cgi.h @@ -31,8 +31,8 @@ * */ -#ifndef __HTTPD_CGI_H__ -#define __HTTPD_CGI_H__ +#ifndef HTTPD_CGI_H_ +#define HTTPD_CGI_H_ #include "contiki.h" #include "httpd.h" @@ -53,4 +53,4 @@ void httpd_cgi_add(struct httpd_cgi_call *c); static struct httpd_cgi_call name = {NULL, str, function} void httpd_cgi_init(void); -#endif /* __HTTPD_CGI_H__ */ +#endif /* HTTPD_CGI_H_ */ diff --git a/apps/webserver-nano/httpd-fs.h b/apps/webserver-nano/httpd-fs.h index 49a8778ab..b68825fc4 100644 --- a/apps/webserver-nano/httpd-fs.h +++ b/apps/webserver-nano/httpd-fs.h @@ -28,8 +28,8 @@ * * This file is part of the lwIP TCP/IP stack. */ -#ifndef __HTTPD_FS_H__ -#define __HTTPD_FS_H__ +#ifndef HTTPD_FS_H_ +#define HTTPD_FS_H_ #include "contiki-net.h" #include "httpd.h" @@ -51,4 +51,4 @@ void* httpd_fs_get_root(void); void httpd_fs_init(void); -#endif /* __HTTPD_FS_H__ */ +#endif /* HTTPD_FS_H_ */ diff --git a/apps/webserver-nano/httpd-fsdata.h b/apps/webserver-nano/httpd-fsdata.h index 5d27e299d..ab1b4cff8 100644 --- a/apps/webserver-nano/httpd-fsdata.h +++ b/apps/webserver-nano/httpd-fsdata.h @@ -31,8 +31,8 @@ * Author: Adam Dunkels * */ -#ifndef __HTTPD_FSDATA_H__ -#define __HTTPD_FSDATA_H__ +#ifndef HTTPD_FSDATA_H_ +#define HTTPD_FSDATA_H_ #include "contiki-net.h" @@ -60,4 +60,4 @@ struct httpd_fsdata_file_noconst { #endif /* HTTPD_FS_STATISTICS */ }; -#endif /* __HTTPD_FSDATA_H__ */ +#endif /* HTTPD_FSDATA_H_ */ diff --git a/apps/webserver-nano/httpd.h b/apps/webserver-nano/httpd.h index d10d389ef..8d86ea094 100644 --- a/apps/webserver-nano/httpd.h +++ b/apps/webserver-nano/httpd.h @@ -31,8 +31,8 @@ * */ -#ifndef __HTTPD_H__ -#define __HTTPD_H__ +#ifndef HTTPD_H_ +#define HTTPD_H_ /* * The default number of simultaneous server connections is 4. Multiple connections can be triggered * by requests for embedded images, style sheets, icons, etc. and a TCP RESET is issued when no more @@ -328,4 +328,4 @@ char TCPBUF[512]; #endif -#endif /* __HTTPD_H__ */ +#endif /* HTTPD_H_ */ diff --git a/apps/webserver-nano/urlconv.h b/apps/webserver-nano/urlconv.h index 75090a090..d5dc1b8d5 100644 --- a/apps/webserver-nano/urlconv.h +++ b/apps/webserver-nano/urlconv.h @@ -30,10 +30,10 @@ * */ -#ifndef __URLCONV_H__ -#define __URLCONV_H__ +#ifndef URLCONV_H_ +#define URLCONV_H_ void urlconv_init(void); void urlconv_tofilename(char *dest, char *source, unsigned char maxlen); -#endif /* __URLCONV_H__ */ +#endif /* URLCONV_H_ */ diff --git a/apps/webserver-nano/webserver-dsc.h b/apps/webserver-nano/webserver-dsc.h index c329f41d8..35aee6e7c 100644 --- a/apps/webserver-nano/webserver-dsc.h +++ b/apps/webserver-nano/webserver-dsc.h @@ -31,11 +31,11 @@ * * */ -#ifndef __WEBSERVER_DSC_H__ -#define __WEBSERVER_DSC_H__ +#ifndef WEBSERVER_DSC_H_ +#define WEBSERVER_DSC_H_ #include "sys/dsc.h" DSC_HEADER(webserver_dsc); -#endif /* __WEBSERVER_DSC_H__ */ +#endif /* WEBSERVER_DSC_H_ */ diff --git a/apps/webserver-nano/webserver-nogui.h b/apps/webserver-nano/webserver-nogui.h index 7f1867016..78f7126b2 100644 --- a/apps/webserver-nano/webserver-nogui.h +++ b/apps/webserver-nano/webserver-nogui.h @@ -31,8 +31,8 @@ * * */ -#ifndef __WEBSERVER_NOGUI_H__ -#define __WEBSERVER_NOGUI_H__ +#ifndef WEBSERVER_NOGUI_H_ +#define WEBSERVER_NOGUI_H_ #include "contiki-net.h" @@ -41,4 +41,4 @@ PROCESS_NAME(webserver_nogui_process); void webserver_log(char *msg); void webserver_log_file(uip_ipaddr_t *requester, char *file); -#endif /* __WEBSERVER_H__ */ +#endif /* WEBSERVER_H_ */ diff --git a/apps/webserver-nano/webserver.h b/apps/webserver-nano/webserver.h index fe9f255a1..c96e7a32c 100644 --- a/apps/webserver-nano/webserver.h +++ b/apps/webserver-nano/webserver.h @@ -31,8 +31,8 @@ * * */ -#ifndef __WEBSERVER_H__ -#define __WEBSERVER_H__ +#ifndef WEBSERVER_H_ +#define WEBSERVER_H_ #include "contiki-net.h" @@ -41,4 +41,4 @@ PROCESS_NAME(webserver_process); void webserver_log(char *msg); void webserver_log_file(uip_ipaddr_t *requester, char *file); -#endif /* __WEBSERVER_H__ */ +#endif /* WEBSERVER_H_ */ diff --git a/apps/webserver/httpd-cfs.h b/apps/webserver/httpd-cfs.h index f99e2271d..fabf3fd76 100644 --- a/apps/webserver/httpd-cfs.h +++ b/apps/webserver/httpd-cfs.h @@ -31,8 +31,8 @@ * */ -#ifndef __HTTPD_CFS_H__ -#define __HTTPD_CFS_H__ +#ifndef HTTPD_CFS_H_ +#define HTTPD_CFS_H_ #include "contiki-net.h" @@ -58,4 +58,4 @@ struct httpd_state { void httpd_init(void); void httpd_appcall(void *state); -#endif /* __HTTPD_CFS_H__ */ +#endif /* HTTPD_CFS_H_ */ diff --git a/apps/webserver/httpd-cgi.h b/apps/webserver/httpd-cgi.h index 21b337a82..db32f6fef 100644 --- a/apps/webserver/httpd-cgi.h +++ b/apps/webserver/httpd-cgi.h @@ -31,8 +31,8 @@ * */ -#ifndef __HTTPD_CGI_H__ -#define __HTTPD_CGI_H__ +#ifndef HTTPD_CGI_H_ +#define HTTPD_CGI_H_ #include "contiki.h" #include "httpd.h" @@ -53,4 +53,4 @@ void httpd_cgi_add(struct httpd_cgi_call *c); static struct httpd_cgi_call name = {NULL, str, function} void httpd_cgi_init(void); -#endif /* __HTTPD_CGI_H__ */ +#endif /* HTTPD_CGI_H_ */ diff --git a/apps/webserver/httpd-fs.h b/apps/webserver/httpd-fs.h index c8cab68d3..ce69ac58d 100644 --- a/apps/webserver/httpd-fs.h +++ b/apps/webserver/httpd-fs.h @@ -31,8 +31,8 @@ * Author: Adam Dunkels * */ -#ifndef __HTTPD_FS_H__ -#define __HTTPD_FS_H__ +#ifndef HTTPD_FS_H_ +#define HTTPD_FS_H_ #include "contiki-net.h" @@ -55,4 +55,4 @@ uint16_t httpd_fs_count(char *name); void httpd_fs_init(void); -#endif /* __HTTPD_FS_H__ */ +#endif /* HTTPD_FS_H_ */ diff --git a/apps/webserver/httpd-fsdata.h b/apps/webserver/httpd-fsdata.h index 5d27e299d..ab1b4cff8 100644 --- a/apps/webserver/httpd-fsdata.h +++ b/apps/webserver/httpd-fsdata.h @@ -31,8 +31,8 @@ * Author: Adam Dunkels * */ -#ifndef __HTTPD_FSDATA_H__ -#define __HTTPD_FSDATA_H__ +#ifndef HTTPD_FSDATA_H_ +#define HTTPD_FSDATA_H_ #include "contiki-net.h" @@ -60,4 +60,4 @@ struct httpd_fsdata_file_noconst { #endif /* HTTPD_FS_STATISTICS */ }; -#endif /* __HTTPD_FSDATA_H__ */ +#endif /* HTTPD_FSDATA_H_ */ diff --git a/apps/webserver/httpd.h b/apps/webserver/httpd.h index 8b0e99818..05080b038 100644 --- a/apps/webserver/httpd.h +++ b/apps/webserver/httpd.h @@ -31,8 +31,8 @@ * */ -#ifndef __HTTPD_H__ -#define __HTTPD_H__ +#ifndef HTTPD_H_ +#define HTTPD_H_ #include "contiki-net.h" @@ -63,4 +63,4 @@ void httpd_appcall(void *state); uint8_t httpd_sprint_ip6(uip_ip6addr_t addr, char * result); #endif /* UIP_CONF_IPV6 */ -#endif /* __HTTPD_H__ */ +#endif /* HTTPD_H_ */ diff --git a/apps/webserver/urlconv.h b/apps/webserver/urlconv.h index 75090a090..d5dc1b8d5 100644 --- a/apps/webserver/urlconv.h +++ b/apps/webserver/urlconv.h @@ -30,10 +30,10 @@ * */ -#ifndef __URLCONV_H__ -#define __URLCONV_H__ +#ifndef URLCONV_H_ +#define URLCONV_H_ void urlconv_init(void); void urlconv_tofilename(char *dest, char *source, unsigned char maxlen); -#endif /* __URLCONV_H__ */ +#endif /* URLCONV_H_ */ diff --git a/apps/webserver/webserver-dsc.h b/apps/webserver/webserver-dsc.h index c329f41d8..35aee6e7c 100644 --- a/apps/webserver/webserver-dsc.h +++ b/apps/webserver/webserver-dsc.h @@ -31,11 +31,11 @@ * * */ -#ifndef __WEBSERVER_DSC_H__ -#define __WEBSERVER_DSC_H__ +#ifndef WEBSERVER_DSC_H_ +#define WEBSERVER_DSC_H_ #include "sys/dsc.h" DSC_HEADER(webserver_dsc); -#endif /* __WEBSERVER_DSC_H__ */ +#endif /* WEBSERVER_DSC_H_ */ diff --git a/apps/webserver/webserver-nogui.h b/apps/webserver/webserver-nogui.h index 7f1867016..78f7126b2 100644 --- a/apps/webserver/webserver-nogui.h +++ b/apps/webserver/webserver-nogui.h @@ -31,8 +31,8 @@ * * */ -#ifndef __WEBSERVER_NOGUI_H__ -#define __WEBSERVER_NOGUI_H__ +#ifndef WEBSERVER_NOGUI_H_ +#define WEBSERVER_NOGUI_H_ #include "contiki-net.h" @@ -41,4 +41,4 @@ PROCESS_NAME(webserver_nogui_process); void webserver_log(char *msg); void webserver_log_file(uip_ipaddr_t *requester, char *file); -#endif /* __WEBSERVER_H__ */ +#endif /* WEBSERVER_H_ */ diff --git a/apps/webserver/webserver.h b/apps/webserver/webserver.h index fe9f255a1..c96e7a32c 100644 --- a/apps/webserver/webserver.h +++ b/apps/webserver/webserver.h @@ -31,8 +31,8 @@ * * */ -#ifndef __WEBSERVER_H__ -#define __WEBSERVER_H__ +#ifndef WEBSERVER_H_ +#define WEBSERVER_H_ #include "contiki-net.h" @@ -41,4 +41,4 @@ PROCESS_NAME(webserver_process); void webserver_log(char *msg); void webserver_log_file(uip_ipaddr_t *requester, char *file); -#endif /* __WEBSERVER_H__ */ +#endif /* WEBSERVER_H_ */ diff --git a/core/cfs/cfs.h b/core/cfs/cfs.h index b5de47235..5b22e0931 100644 --- a/core/cfs/cfs.h +++ b/core/cfs/cfs.h @@ -55,8 +55,8 @@ * Author: Adam Dunkels * */ -#ifndef __CFS_H__ -#define __CFS_H__ +#ifndef CFS_H_ +#define CFS_H_ #include "contiki.h" @@ -276,7 +276,7 @@ CCIF int cfs_readdir(struct cfs_dir *dirp, struct cfs_dirent *dirent); CCIF void cfs_closedir(struct cfs_dir *dirp); #endif -#endif /* __CFS_H__ */ +#endif /* CFS_H_ */ /** @} */ /** @} */ diff --git a/core/contiki-lib.h b/core/contiki-lib.h index efacd954a..7ff67fbb0 100644 --- a/core/contiki-lib.h +++ b/core/contiki-lib.h @@ -31,8 +31,8 @@ * Author: Adam Dunkels * */ -#ifndef __CONTIKI_LIB_H__ -#define __CONTIKI_LIB_H__ +#ifndef CONTIKI_LIB_H_ +#define CONTIKI_LIB_H_ #include "contiki.h" #include "lib/list.h" @@ -40,4 +40,4 @@ #include "lib/mmem.h" #include "lib/random.h" -#endif /* __CONTIKI_LIB_H__ */ +#endif /* CONTIKI_LIB_H_ */ diff --git a/core/contiki-net.h b/core/contiki-net.h index 935e2a211..5e6cddd40 100644 --- a/core/contiki-net.h +++ b/core/contiki-net.h @@ -31,8 +31,8 @@ * Author: Adam Dunkels * */ -#ifndef __CONTIKI_NET_H__ -#define __CONTIKI_NET_H__ +#ifndef CONTIKI_NET_H_ +#define CONTIKI_NET_H_ #include "contiki.h" @@ -58,4 +58,4 @@ #include "net/netstack.h" -#endif /* __CONTIKI_NET_H__ */ +#endif /* CONTIKI_NET_H_ */ diff --git a/core/contiki.h b/core/contiki.h index e3f72fe92..804c3dab0 100644 --- a/core/contiki.h +++ b/core/contiki.h @@ -31,8 +31,8 @@ * Author: Adam Dunkels * */ -#ifndef __CONTIKI_H__ -#define __CONTIKI_H__ +#ifndef CONTIKI_H_ +#define CONTIKI_H_ #include "contiki-version.h" #include "contiki-conf.h" @@ -55,4 +55,4 @@ #include "sys/energest.h" -#endif /* __CONTIKI_H__ */ +#endif /* CONTIKI_H_ */ diff --git a/core/ctk/ctk-conio.h b/core/ctk/ctk-conio.h index df4073c62..0c6ec6709 100644 --- a/core/ctk/ctk-conio.h +++ b/core/ctk/ctk-conio.h @@ -32,8 +32,8 @@ * */ -#ifndef __CTK_CONIO_H__ -#define __CTK_CONIO_H__ +#ifndef CTK_CONIO_H_ +#define CTK_CONIO_H_ #include @@ -62,4 +62,4 @@ typedef char ctk_arch_key_t; #define CH_CURS_LEFT 255 #endif /* CH_CURS_LEFT */ -#endif /* __CTK_CONIO_H__ */ +#endif /* CTK_CONIO_H_ */ diff --git a/core/ctk/ctk-draw.h b/core/ctk/ctk-draw.h index bdd72d717..ed3c0d493 100644 --- a/core/ctk/ctk-draw.h +++ b/core/ctk/ctk-draw.h @@ -48,8 +48,8 @@ * */ -#ifndef __CTK_DRAW_H__ -#define __CTK_DRAW_H__ +#ifndef CTK_DRAW_H_ +#define CTK_DRAW_H_ #include "ctk/ctk.h" #include "contiki-conf.h" @@ -281,7 +281,7 @@ extern unsigned char ctk_draw_windowborder_width, ctk_draw_windowtitle_height; -#endif /* __CTK_DRAW_H__ */ +#endif /* CTK_DRAW_H_ */ /** diff --git a/core/ctk/ctk-mouse.h b/core/ctk/ctk-mouse.h index 6742f40e9..d2fc553e0 100644 --- a/core/ctk/ctk-mouse.h +++ b/core/ctk/ctk-mouse.h @@ -31,8 +31,8 @@ * * */ -#ifndef __CTK_MOUSE_H__ -#define __CTK_MOUSE_H__ +#ifndef CTK_MOUSE_H_ +#define CTK_MOUSE_H_ #include "contiki-conf.h" @@ -68,4 +68,4 @@ void ctk_mouse_show(void); #endif /* CTK_CONF_MOUSE_SUPPORT */ -#endif /* __CTK_MOUSE_H__ */ +#endif /* CTK_MOUSE_H_ */ diff --git a/core/ctk/ctk-vncarch.h b/core/ctk/ctk-vncarch.h index 7082005d8..0f8579c3c 100644 --- a/core/ctk/ctk-vncarch.h +++ b/core/ctk/ctk-vncarch.h @@ -31,8 +31,8 @@ * * */ -#ifndef __CTK_VNCARCH_H__ -#define __CTK_VNCARCH_H__ +#ifndef CTK_VNCARCH_H_ +#define CTK_VNCARCH_H_ #define CTK_ARCH_KEY_T unsigned char @@ -64,4 +64,4 @@ CTK_ARCH_KEY_T ctk_arch_getkey(void); -#endif /* __CTK_VNCARCH_H__ */ +#endif /* CTK_VNCARCH_H_ */ diff --git a/core/ctk/ctk-vncfont.h b/core/ctk/ctk-vncfont.h index bd277bd3e..89d777a9f 100644 --- a/core/ctk/ctk-vncfont.h +++ b/core/ctk/ctk-vncfont.h @@ -31,8 +31,8 @@ * * */ -#ifndef __CTK_VNCFONT_H__ -#define __CTK_VNCFONT_H__ +#ifndef CTK_VNCFONT_H_ +#define CTK_VNCFONT_H_ #define CTK_VNCFONT_WIDTH 6 #define CTK_VNCFONT_HEIGHT 8 @@ -42,4 +42,4 @@ extern unsigned char ctk_vncfont[CTK_VNCFONT_WIDTH * CTK_VNCFONT_HEIGHT * 128]; -#endif /* __CTK_VNCFONT_H__ */ +#endif /* CTK_VNCFONT_H_ */ diff --git a/core/ctk/ctk-vncserver.h b/core/ctk/ctk-vncserver.h index 1b09a8cb3..e416d9305 100644 --- a/core/ctk/ctk-vncserver.h +++ b/core/ctk/ctk-vncserver.h @@ -31,12 +31,12 @@ * * */ -#ifndef __CTK_VNCSERVER_H__ -#define __CTK_VNCSERVER_H__ +#ifndef CTK_VNCSERVER_H_ +#define CTK_VNCSERVER_H_ #include "contiki.h" void ctk_vncserver_init(char *arg); PROCESS_NAME(ctk_vncserver_process); -#endif /* __CTK_VNCSERVER_H__ */ +#endif /* CTK_VNCSERVER_H_ */ diff --git a/core/ctk/ctk.h b/core/ctk/ctk.h index 150b15edf..5d58a7e56 100644 --- a/core/ctk/ctk.h +++ b/core/ctk/ctk.h @@ -46,8 +46,8 @@ * */ -#ifndef __CTK_H__ -#define __CTK_H__ +#ifndef CTK_H_ +#define CTK_H_ #include "contiki-conf.h" @@ -986,4 +986,4 @@ CCIF extern process_event_t ctk_signal_button_activate, /** @} */ /** @} */ /** @} */ -#endif /* __CTK_H__ */ +#endif /* CTK_H_ */ diff --git a/core/ctk/vnc-out.h b/core/ctk/vnc-out.h index e7187ad48..f436e7756 100644 --- a/core/ctk/vnc-out.h +++ b/core/ctk/vnc-out.h @@ -31,8 +31,8 @@ * */ -#ifndef __VNC_OUT_H__ -#define __VNC_OUT_H__ +#ifndef VNC_OUT_H_ +#define VNC_OUT_H_ void vnc_out_init(void); @@ -88,4 +88,4 @@ unsigned char vnc_out_add_icon(struct ctk_icon *icon); #endif -#endif /* __VNC_OUT_H__ */ +#endif /* VNC_OUT_H_ */ diff --git a/core/ctk/vnc-server.h b/core/ctk/vnc-server.h index 1e0d6d24a..2acfb4d97 100644 --- a/core/ctk/vnc-server.h +++ b/core/ctk/vnc-server.h @@ -31,8 +31,8 @@ * */ -#ifndef __VNC_SERVER_H__ -#define __VNC_SERVER_H__ +#ifndef VNC_SERVER_H_ +#define VNC_SERVER_H_ /*struct vnc_server_updatearea { @@ -292,4 +292,4 @@ struct rfb_client_cut_text { uint8_t len[4]; }; -#endif /* __VNC_SERVER_H__ */ +#endif /* VNC_SERVER_H_ */ diff --git a/core/dev/battery-sensor.h b/core/dev/battery-sensor.h index 606e83e0e..3f65928de 100644 --- a/core/dev/battery-sensor.h +++ b/core/dev/battery-sensor.h @@ -35,8 +35,8 @@ * $Revision: 1.1 $ */ -#ifndef __BATTERY_SENSOR_H__ -#define __BATTERY_SENSOR_H__ +#ifndef BATTERY_SENSOR_H_ +#define BATTERY_SENSOR_H_ #include "lib/sensors.h" @@ -44,4 +44,4 @@ extern const struct sensors_sensor battery_sensor; #define BATTERY_SENSOR "Battery" -#endif /* __BATTERY_SENSOR_H__ */ +#endif /* BATTERY_SENSOR_H_ */ diff --git a/core/dev/button-sensor.h b/core/dev/button-sensor.h index 8154ade1c..b05d80db9 100644 --- a/core/dev/button-sensor.h +++ b/core/dev/button-sensor.h @@ -29,8 +29,8 @@ * This file is part of the Contiki operating system. * */ -#ifndef __BUTTON_SENSOR_H__ -#define __BUTTON_SENSOR_H__ +#ifndef BUTTON_SENSOR_H_ +#define BUTTON_SENSOR_H_ #include "lib/sensors.h" @@ -38,4 +38,4 @@ extern const struct sensors_sensor button_sensor; #define BUTTON_SENSOR "Button" -#endif /* __BUTTON_SENSOR_H__ */ +#endif /* BUTTON_SENSOR_H_ */ diff --git a/core/dev/cc2420-aes.h b/core/dev/cc2420-aes.h index bf9098086..df54f97d2 100644 --- a/core/dev/cc2420-aes.h +++ b/core/dev/cc2420-aes.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __CC2420_AES_H__ -#define __CC2420_AES_H__ +#ifndef CC2420_AES_H_ +#define CC2420_AES_H_ /** * \brief Setup an AES key @@ -72,4 +72,4 @@ void cc2420_aes_set_key(const uint8_t *key, int index); void cc2420_aes_cipher(uint8_t *data, int len, int key_index); -#endif /* __CC2420_AES_H__ */ +#endif /* CC2420_AES_H_ */ diff --git a/core/dev/cc2420.h b/core/dev/cc2420.h index 57ee01ed4..9fd09d88b 100644 --- a/core/dev/cc2420.h +++ b/core/dev/cc2420.h @@ -38,8 +38,8 @@ * Joakim Eriksson */ -#ifndef __CC2420_H__ -#define __CC2420_H__ +#ifndef CC2420_H_ +#define CC2420_H_ #include "contiki.h" #include "dev/spi.h" @@ -200,4 +200,4 @@ void cc2420_set_cca_threshold(int value); CC2420_SPI_DISABLE(); \ } while (0) -#endif /* __CC2420_H__ */ +#endif /* CC2420_H_ */ diff --git a/core/dev/cc2520.h b/core/dev/cc2520.h index 234329d82..032b32b8d 100644 --- a/core/dev/cc2520.h +++ b/core/dev/cc2520.h @@ -37,8 +37,8 @@ * Joakim Eriksson */ -#ifndef __CC2520_H__ -#define __CC2520_H__ +#ifndef CC2520_H_ +#define CC2520_H_ #include "contiki.h" #include "dev/spi.h" @@ -195,4 +195,4 @@ void cc2520_set_cca_threshold(int value); CC2520_SPI_DISABLE(); \ } while (0) -#endif /* __CC2520_H__ */ +#endif /* CC2520_H_ */ diff --git a/core/dev/eeprom.h b/core/dev/eeprom.h index 4a1ff0c8b..8ff90ff1c 100644 --- a/core/dev/eeprom.h +++ b/core/dev/eeprom.h @@ -51,8 +51,8 @@ */ -#ifndef __EEPROM_H__ -#define __EEPROM_H__ +#ifndef EEPROM_H_ +#define EEPROM_H_ typedef unsigned short eeprom_addr_t; @@ -111,7 +111,7 @@ void eeprom_read(eeprom_addr_t addr, unsigned char *buf, int size); void eeprom_init(void); -#endif /* __EEPROM_H__ */ +#endif /* EEPROM_H_ */ /** @} */ /** @} */ diff --git a/core/dev/leds.h b/core/dev/leds.h index 4b4ced6c8..82132e9a9 100644 --- a/core/dev/leds.h +++ b/core/dev/leds.h @@ -44,8 +44,8 @@ * @{ */ -#ifndef __LEDS_H__ -#define __LEDS_H__ +#ifndef LEDS_H_ +#define LEDS_H_ /* Allow platform to override LED numbering */ #include "contiki-conf.h" @@ -92,4 +92,4 @@ void leds_arch_init(void); unsigned char leds_arch_get(void); void leds_arch_set(unsigned char leds); -#endif /* __LEDS_H__ */ +#endif /* LEDS_H_ */ diff --git a/core/dev/radio-sensor.h b/core/dev/radio-sensor.h index 488d97533..601f129cf 100644 --- a/core/dev/radio-sensor.h +++ b/core/dev/radio-sensor.h @@ -29,8 +29,8 @@ * This file is part of the Contiki operating system. * */ -#ifndef __RADIO_SENSOR_H__ -#define __RADIO_SENSOR_H__ +#ifndef RADIO_SENSOR_H_ +#define RADIO_SENSOR_H_ #include "lib/sensors.h" @@ -43,4 +43,4 @@ extern const struct sensors_sensor radio_sensor; extern unsigned int radio_sensor_signal; -#endif /* __RADIO_SENSOR_H__ */ +#endif /* RADIO_SENSOR_H_ */ diff --git a/core/dev/radio.h b/core/dev/radio.h index faa1e40d6..69eee756e 100644 --- a/core/dev/radio.h +++ b/core/dev/radio.h @@ -51,8 +51,8 @@ * Adam Dunkels */ -#ifndef __RADIO_H__ -#define __RADIO_H__ +#ifndef RADIO_H_ +#define RADIO_H_ /** * The structure of a device driver for a radio in Contiki. @@ -98,7 +98,7 @@ enum { RADIO_TX_NOACK, }; -#endif /* __RADIO_H__ */ +#endif /* RADIO_H_ */ /** @} */ diff --git a/core/dev/serial-line.h b/core/dev/serial-line.h index 0ddb34755..4d4cec346 100644 --- a/core/dev/serial-line.h +++ b/core/dev/serial-line.h @@ -36,8 +36,8 @@ * Adam Dunkels * */ -#ifndef __SERIAL_LINE_H__ -#define __SERIAL_LINE_H__ +#ifndef SERIAL_LINE_H_ +#define SERIAL_LINE_H_ #include "contiki.h" @@ -73,4 +73,4 @@ void serial_line_init(void); PROCESS_NAME(serial_line_process); -#endif /* __SERIAL_LINE_H__ */ +#endif /* SERIAL_LINE_H_ */ diff --git a/core/dev/sht11-sensor.h b/core/dev/sht11-sensor.h index 30442369d..7395a49fd 100644 --- a/core/dev/sht11-sensor.h +++ b/core/dev/sht11-sensor.h @@ -36,8 +36,8 @@ * $Revision: 1.2 $ */ -#ifndef __SHT11_SENSOR_H__ -#define __SHT11_SENSOR_H__ +#ifndef SHT11_SENSOR_H_ +#define SHT11_SENSOR_H_ #include "lib/sensors.h" @@ -48,4 +48,4 @@ extern const struct sensors_sensor sht11_sensor; #define SHT11_SENSOR_BATTERY_INDICATOR 2 -#endif /* __SHT11-SENSOR_H__ */ +#endif /* SHT11-SENSOR_H_ */ diff --git a/core/dev/slip.h b/core/dev/slip.h index 756611c2c..ddc8c7e74 100644 --- a/core/dev/slip.h +++ b/core/dev/slip.h @@ -31,8 +31,8 @@ * */ -#ifndef __SLIP_H__ -#define __SLIP_H__ +#ifndef SLIP_H_ +#define SLIP_H_ #include "contiki.h" @@ -83,4 +83,4 @@ void slip_set_input_callback(void (*callback)(void)); void slip_arch_init(unsigned long ubr); void slip_arch_writeb(unsigned char c); -#endif /* __SLIP_H__ */ +#endif /* SLIP_H_ */ diff --git a/core/dev/spi.h b/core/dev/spi.h index 189178e16..a36be1ca7 100644 --- a/core/dev/spi.h +++ b/core/dev/spi.h @@ -36,8 +36,8 @@ * Niclas Finne */ -#ifndef __SPI_H__ -#define __SPI_H__ +#ifndef SPI_H_ +#define SPI_H_ /* Define macros to use for checking SPI transmission status depending on if it is possible to wait for TX buffer ready. This is possible @@ -88,4 +88,4 @@ void spi_init(void); } while(0); -#endif /* __SPI_H__ */ +#endif /* SPI_H_ */ diff --git a/core/dev/watchdog.h b/core/dev/watchdog.h index b0281a1d7..3985239aa 100644 --- a/core/dev/watchdog.h +++ b/core/dev/watchdog.h @@ -29,8 +29,8 @@ * This file is part of the Contiki operating system. * */ -#ifndef __WATCHDOG_H__ -#define __WATCHDOG_H__ +#ifndef WATCHDOG_H_ +#define WATCHDOG_H_ void watchdog_init(void); void watchdog_start(void); @@ -39,4 +39,4 @@ void watchdog_stop(void); void watchdog_reboot(void); -#endif /* __WATCHDOG_H__ */ +#endif /* WATCHDOG_H_ */ diff --git a/core/lib/crc16.h b/core/lib/crc16.h index 72010c706..ad1f785c8 100644 --- a/core/lib/crc16.h +++ b/core/lib/crc16.h @@ -51,8 +51,8 @@ * This file is part of the Contiki operating system. * */ -#ifndef __CRC16_H__ -#define __CRC16_H__ +#ifndef CRC16_H_ +#define CRC16_H_ /** * \brief Update an accumulated CRC16 checksum with one byte. @@ -89,7 +89,7 @@ unsigned short crc16_add(unsigned char b, unsigned short crc); unsigned short crc16_data(const unsigned char *data, int datalen, unsigned short acc); -#endif /* __CRC16_H__ */ +#endif /* CRC16_H_ */ /** @} */ /** @} */ diff --git a/core/lib/ctk-filedialog.h b/core/lib/ctk-filedialog.h index 796f39f6d..9c66c88d4 100644 --- a/core/lib/ctk-filedialog.h +++ b/core/lib/ctk-filedialog.h @@ -31,8 +31,8 @@ * Author: Adam Dunkels * */ -#ifndef __CTK_FILEDIALOG_H__ -#define __CTK_FILEDIALOG_H__ +#ifndef CTK_FILEDIALOG_H_ +#define CTK_FILEDIALOG_H_ #include "contiki.h" @@ -47,4 +47,4 @@ void ctk_filedialog_open(CC_REGISTER_ARG struct ctk_filedialog_state *s, char ctk_filedialog_eventhandler(struct ctk_filedialog_state *s, process_event_t ev, process_data_t data); -#endif /* __CTK_FILEDIALOG_H__ */ +#endif /* CTK_FILEDIALOG_H_ */ diff --git a/core/lib/ctk-textentry-checkbox.h b/core/lib/ctk-textentry-checkbox.h index 5bf133adc..3c326b598 100644 --- a/core/lib/ctk-textentry-checkbox.h +++ b/core/lib/ctk-textentry-checkbox.h @@ -31,10 +31,10 @@ * * */ -#ifndef __CTK_TEXTENTRY_CHECKBOX_H__ -#define __CTK_TEXTENTRY_CHECKBOX_H__ +#ifndef CTK_TEXTENTRY_CHECKBOX_H_ +#define CTK_TEXTENTRY_CHECKBOX_H_ unsigned char ctk_textentry_checkbox_input(ctk_arch_key_t c, struct ctk_textentry *t); -#endif /* __CTK_TEXTENTRY_CHECKBOX_H__ */ +#endif /* CTK_TEXTENTRY_CHECKBOX_H_ */ diff --git a/core/lib/ctk-textentry-cmdline.h b/core/lib/ctk-textentry-cmdline.h index 6a904b3fa..8f74156c1 100644 --- a/core/lib/ctk-textentry-cmdline.h +++ b/core/lib/ctk-textentry-cmdline.h @@ -31,12 +31,12 @@ * * */ -#ifndef __CTK_TEXTENTRY_CMDLINE_H__ -#define __CTK_TEXTENTRY_CMDLINE_H__ +#ifndef CTK_TEXTENTRY_CMDLINE_H_ +#define CTK_TEXTENTRY_CMDLINE_H_ #include "ctk/ctk.h" unsigned char ctk_textentry_cmdline_input(ctk_arch_key_t c, struct ctk_textentry *t); -#endif /* __CTK_TEXTENTRY_CMDLINE_H__ */ +#endif /* CTK_TEXTENTRY_CMDLINE_H_ */ diff --git a/core/lib/ctk-textentry-multiline.h b/core/lib/ctk-textentry-multiline.h index 2a2ba825a..49342c019 100644 --- a/core/lib/ctk-textentry-multiline.h +++ b/core/lib/ctk-textentry-multiline.h @@ -31,10 +31,10 @@ * * */ -#ifndef __CTK_TEXTENTRY_MULTILINE_H__ -#define __CTK_TEXTENTRY_MULTILINE_H__ +#ifndef CTK_TEXTENTRY_MULTILINE_H_ +#define CTK_TEXTENTRY_MULTILINE_H_ unsigned char ctk_textentry_multiline_input(ctk_arch_key_t c, struct ctk_textentry *t); -#endif /* __CTK_TEXTENTRY_MULTILINE_H__ */ +#endif /* CTK_TEXTENTRY_MULTILINE_H_ */ diff --git a/core/lib/gcr.h b/core/lib/gcr.h index 69139619f..10c36550d 100644 --- a/core/lib/gcr.h +++ b/core/lib/gcr.h @@ -35,8 +35,8 @@ * $Revision: 1.1 $ */ -#ifndef __GCR_H__ -#define __GCR_H__ +#ifndef GCR_H_ +#define GCR_H_ void gcr_init(); unsigned char gcr_finished(); @@ -48,4 +48,4 @@ unsigned char gcr_get_encoded(unsigned char *raw_data); unsigned char gcr_get_decoded(unsigned char *raw_data); unsigned char gcr_valid(); -#endif /* __GCR_H__ */ +#endif /* GCR_H_ */ diff --git a/core/lib/libconio.h b/core/lib/libconio.h index b60260472..b9810f778 100644 --- a/core/lib/libconio.h +++ b/core/lib/libconio.h @@ -32,8 +32,8 @@ * */ -#ifndef __LIBCONIO_H__ -#define __LIBCONIO_H__ +#ifndef LIBCONIO_H_ +#define LIBCONIO_H_ /* This function must be implemented specifically for the architecture: */ @@ -81,4 +81,4 @@ void textcolor(unsigned char c); -#endif /* __LIBCONIO_H__ */ +#endif /* LIBCONIO_H_ */ diff --git a/core/lib/list.h b/core/lib/list.h index cd305efed..48e51401e 100644 --- a/core/lib/list.h +++ b/core/lib/list.h @@ -65,8 +65,8 @@ * Author: Adam Dunkels * */ -#ifndef __LIST_H__ -#define __LIST_H__ +#ifndef LIST_H_ +#define LIST_H_ #define LIST_CONCAT2(s1, s2) s1##s2 #define LIST_CONCAT(s1, s2) LIST_CONCAT2(s1, s2) @@ -153,7 +153,7 @@ void list_insert(list_t list, void *previtem, void *newitem); void * list_item_next(void *item); -#endif /* __LIST_H__ */ +#endif /* LIST_H_ */ /** @} */ /** @} */ diff --git a/core/lib/me.h b/core/lib/me.h index a1440fc34..44abcee61 100644 --- a/core/lib/me.h +++ b/core/lib/me.h @@ -61,15 +61,15 @@ * */ -#ifndef __ME_H__ -#define __ME_H__ +#ifndef ME_H_ +#define ME_H_ unsigned char me_valid(unsigned char m); unsigned short me_encode(unsigned char c); unsigned char me_decode16(unsigned short m); unsigned char me_decode8(unsigned char m); -#endif /* __ME_H__ */ +#endif /* ME_H_ */ /** @} */ /** @} */ diff --git a/core/lib/me_tabs.h b/core/lib/me_tabs.h index 35acae698..0566aa0ad 100644 --- a/core/lib/me_tabs.h +++ b/core/lib/me_tabs.h @@ -29,12 +29,12 @@ * This file is part of the Contiki operating system. * */ -#ifndef __ME_TABS_H__ -#define __ME_TABS_H__ +#ifndef ME_TABS_H_ +#define ME_TABS_H_ extern const unsigned short me_encode_tab[256]; extern const unsigned char me_decode_tab[256]; extern const unsigned char me_valid_tab[256]; -#endif /* __ME_TABS_H__ */ +#endif /* ME_TABS_H_ */ diff --git a/core/lib/memb.h b/core/lib/memb.h index fc8c3bd7c..f5e654cc1 100644 --- a/core/lib/memb.h +++ b/core/lib/memb.h @@ -60,8 +60,8 @@ * */ -#ifndef __MEMB_H__ -#define __MEMB_H__ +#ifndef MEMB_H_ +#define MEMB_H_ #include "sys/cc.h" @@ -134,4 +134,4 @@ int memb_inmemb(struct memb *m, void *ptr); /** @} */ /** @} */ -#endif /* __MEMB_H__ */ +#endif /* MEMB_H_ */ diff --git a/core/lib/mmem.h b/core/lib/mmem.h index 24a54f513..e075f585b 100644 --- a/core/lib/mmem.h +++ b/core/lib/mmem.h @@ -56,8 +56,8 @@ * */ -#ifndef __MMEM_H__ -#define __MMEM_H__ +#ifndef MMEM_H_ +#define MMEM_H_ /*---------------------------------------------------------------------------*/ /** @@ -87,7 +87,7 @@ int mmem_alloc(struct mmem *m, unsigned int size); void mmem_free(struct mmem *); void mmem_init(void); -#endif /* __MMEM_H__ */ +#endif /* MMEM_H_ */ /** @} */ /** @} */ diff --git a/core/lib/petsciiconv.h b/core/lib/petsciiconv.h index 4d9e51779..87e9c916d 100644 --- a/core/lib/petsciiconv.h +++ b/core/lib/petsciiconv.h @@ -46,8 +46,8 @@ * * */ -#ifndef __PETSCIICONV_H__ -#define __PETSCIICONV_H__ +#ifndef PETSCIICONV_H_ +#define PETSCIICONV_H_ #ifdef WITH_PETSCII @@ -75,4 +75,4 @@ void petsciiconv_topetscii(char *buf, unsigned int len); #endif /* WITH_PETSCII */ -#endif /* __PETSCIICONV_H__ */ +#endif /* PETSCIICONV_H_ */ diff --git a/core/lib/print-stats.h b/core/lib/print-stats.h index 5996b7359..32ef3205e 100644 --- a/core/lib/print-stats.h +++ b/core/lib/print-stats.h @@ -37,9 +37,9 @@ * Adam Dunkels */ -#ifndef __PRINT_STATS_H__ -#define __PRINT_STATS_H__ +#ifndef PRINT_STATS_H_ +#define PRINT_STATS_H_ void print_stats(void); -#endif /* __PRINT_STATS_H__ */ +#endif /* PRINT_STATS_H_ */ diff --git a/core/lib/random.h b/core/lib/random.h index 1428c6fd7..cb206e23b 100644 --- a/core/lib/random.h +++ b/core/lib/random.h @@ -29,8 +29,8 @@ * This file is part of the Contiki operating system. * */ -#ifndef __RANDOM_H__ -#define __RANDOM_H__ +#ifndef RANDOM_H_ +#define RANDOM_H_ /* * Initialize the pseudo-random generator. @@ -49,4 +49,4 @@ unsigned short random_rand(void); /* Since random_rand casts to unsigned short, we'll use this maxmimum */ #define RANDOM_RAND_MAX 65535U -#endif /* __RANDOM_H__ */ +#endif /* RANDOM_H_ */ diff --git a/core/lib/ringbuf.h b/core/lib/ringbuf.h index 876d18412..390000524 100644 --- a/core/lib/ringbuf.h +++ b/core/lib/ringbuf.h @@ -50,8 +50,8 @@ * Adam Dunkels */ -#ifndef __RINGBUF_H__ -#define __RINGBUF_H__ +#ifndef RINGBUF_H_ +#define RINGBUF_H_ #include "contiki-conf.h" @@ -128,4 +128,4 @@ int ringbuf_size(struct ringbuf *r); */ int ringbuf_elements(struct ringbuf *r); -#endif /* __RINGBUF_H__ */ +#endif /* RINGBUF_H_ */ diff --git a/core/lib/sensors.h b/core/lib/sensors.h index 80d0103a7..11b9fba17 100644 --- a/core/lib/sensors.h +++ b/core/lib/sensors.h @@ -30,8 +30,8 @@ * */ -#ifndef __SENSORS_H__ -#define __SENSORS_H__ +#ifndef SENSORS_H_ +#define SENSORS_H_ #include "contiki.h" @@ -69,4 +69,4 @@ extern process_event_t sensors_event; PROCESS_NAME(sensors_process); -#endif /* __SENSORS_H__ */ +#endif /* SENSORS_H_ */ diff --git a/core/lib/settings.h b/core/lib/settings.h index c35a88743..79350c54d 100644 --- a/core/lib/settings.h +++ b/core/lib/settings.h @@ -30,8 +30,8 @@ * */ -#ifndef __CONTIKI_SETTINGS_H__ -#define __CONTIKI_SETTINGS_H__ +#ifndef CONTIKI_SETTINGS_H_ +#define CONTIKI_SETTINGS_H_ /** @file settings.h * @brief Settings Manager @@ -366,4 +366,4 @@ settings_set_uint64(settings_key_t key, uint64_t value) #endif /* !SETTINGS_CONF_SKIP_CONVENIENCE_FUNCS */ -#endif /* !defined(__CONTIKI_SETTINGS_H__) */ +#endif /* !defined(CONTIKI_SETTINGS_H_) */ diff --git a/core/lib/trickle-timer.h b/core/lib/trickle-timer.h index dedee3301..b1cf765bc 100644 --- a/core/lib/trickle-timer.h +++ b/core/lib/trickle-timer.h @@ -68,8 +68,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __TRICKLE_TIMER_H__ -#define __TRICKLE_TIMER_H__ +#ifndef TRICKLE_TIMER_H_ +#define TRICKLE_TIMER_H_ #include "contiki-conf.h" #include "sys/ctimer.h" @@ -509,6 +509,6 @@ void trickle_timer_inconsistency(struct trickle_timer *tt); /** @} */ -#endif /* __TRICKLE_TIMER_H__ */ +#endif /* TRICKLE_TIMER_H_ */ /** @} */ /** @} */ diff --git a/core/loader/dlloader.h b/core/loader/dlloader.h index 580caf4e5..9161c6263 100644 --- a/core/loader/dlloader.h +++ b/core/loader/dlloader.h @@ -29,9 +29,9 @@ * This file is part of the Contiki operating system. * */ -#ifndef __DLLOADER_H__ -#define __DLLOADER_H__ +#ifndef DLLOADER_H_ +#define DLLOADER_H_ int dlloader_load(char *name, char *arg); -#endif /* __SOLOADR_H__ */ +#endif /* SOLOADR_H_ */ diff --git a/core/loader/elfloader-arch.h b/core/loader/elfloader-arch.h index 2d1b54122..020b30a54 100644 --- a/core/loader/elfloader-arch.h +++ b/core/loader/elfloader-arch.h @@ -62,8 +62,8 @@ * */ -#ifndef __ELFLOADER_ARCH_H__ -#define __ELFLOADER_ARCH_H__ +#ifndef ELFLOADER_ARCH_H_ +#define ELFLOADER_ARCH_H_ #include "loader/elfloader.h" @@ -133,7 +133,7 @@ void elfloader_arch_relocate(int fd, unsigned int sectionoffset, */ void elfloader_arch_write_rom(int fd, unsigned short textoff, unsigned int size, char *mem); -#endif /* __ELFLOADER_ARCH_H__ */ +#endif /* ELFLOADER_ARCH_H_ */ /** @} */ /** @} */ diff --git a/core/loader/elfloader.h b/core/loader/elfloader.h index 3df4914a7..6c144c271 100644 --- a/core/loader/elfloader.h +++ b/core/loader/elfloader.h @@ -71,8 +71,8 @@ * This file is part of the Contiki operating system. * */ -#ifndef __ELFLOADER_H__ -#define __ELFLOADER_H__ +#ifndef ELFLOADER_H_ +#define ELFLOADER_H_ #include "cfs/cfs.h" @@ -187,7 +187,7 @@ struct elf32_rela { }; -#endif /* __ELFLOADER_H__ */ +#endif /* ELFLOADER_H_ */ /** @} */ /** @} */ diff --git a/core/loader/elfloader_compat.h b/core/loader/elfloader_compat.h index ad334d22f..c707cd8cc 100644 --- a/core/loader/elfloader_compat.h +++ b/core/loader/elfloader_compat.h @@ -29,8 +29,8 @@ * This file is part of the Contiki operating system. * */ -#ifndef __ELFLOADER_H__ -#define __ELFLOADER_H__ +#ifndef ELFLOADER_H_ +#define ELFLOADER_H_ #define ELFLOADER_OK 0 #define ELFLOADER_BAD_ELF_HEADER 1 @@ -51,4 +51,4 @@ extern struct process *elfloader_loaded_process; extern void (*elfloader_fini)(void); extern char elfloader_unknown[30]; -#endif /* __ELFLOADER_H__ */ +#endif /* ELFLOADER_H_ */ diff --git a/core/loader/symbols-def.h b/core/loader/symbols-def.h index 3dd076273..1037501af 100644 --- a/core/loader/symbols-def.h +++ b/core/loader/symbols-def.h @@ -29,8 +29,8 @@ * This file is part of the Contiki operating system. * */ -#ifndef __SYMBOLS_DEF_H__ -#define __SYMBOLS_DEF_H__ +#ifndef SYMBOLS_DEF_H_ +#define SYMBOLS_DEF_H_ struct symbols { const char *name; @@ -41,4 +41,4 @@ extern const int symbols_nelts; extern const struct symbols symbols[/* symbols_nelts */]; -#endif /* __SYMBOLS_DEF_H__ */ +#endif /* SYMBOLS_DEF_H_ */ diff --git a/core/loader/symbols.h b/core/loader/symbols.h index bfb0897ed..7e3fa4164 100644 --- a/core/loader/symbols.h +++ b/core/loader/symbols.h @@ -29,8 +29,8 @@ * This file is part of the Contiki operating system. * */ -#ifndef __SYMBOLS_H__ -#define __SYMBOLS_H__ +#ifndef SYMBOLS_H_ +#define SYMBOLS_H_ struct symbols { const char *name; @@ -41,4 +41,4 @@ extern const int symbols_nelts; extern const struct symbols symbols[/* symbols_nelts */]; -#endif /* __SYMBOLS_H__ */ +#endif /* SYMBOLS_H_ */ diff --git a/core/loader/symtab.h b/core/loader/symtab.h index 9f89b2b8e..29cbe9a06 100644 --- a/core/loader/symtab.h +++ b/core/loader/symtab.h @@ -29,9 +29,9 @@ * This file is part of the Contiki operating system. * */ -#ifndef __SYMTAB_H__ -#define __SYMTAB_H__ +#ifndef SYMTAB_H_ +#define SYMTAB_H_ void *symtab_lookup(const char *name); -#endif /* __SYMTAB_H__ */ +#endif /* SYMTAB_H_ */ diff --git a/core/net/dhcpc.h b/core/net/dhcpc.h index 4f8bf51a0..aaa7e10b8 100644 --- a/core/net/dhcpc.h +++ b/core/net/dhcpc.h @@ -29,8 +29,8 @@ * This file is part of the Contiki operating system. * */ -#ifndef __DHCPC_H__ -#define __DHCPC_H__ +#ifndef DHCPC_H_ +#define DHCPC_H_ struct dhcpc_state { struct pt pt; @@ -59,4 +59,4 @@ void dhcpc_appcall(process_event_t ev, void *data); void dhcpc_configured(const struct dhcpc_state *s); void dhcpc_unconfigured(const struct dhcpc_state *s); -#endif /* __DHCPC_H__ */ +#endif /* DHCPC_H_ */ diff --git a/core/net/mac/csma.h b/core/net/mac/csma.h index b069847e9..456b828ce 100644 --- a/core/net/mac/csma.h +++ b/core/net/mac/csma.h @@ -38,8 +38,8 @@ * Adam Dunkels */ -#ifndef __CSMA_H__ -#define __CSMA_H__ +#ifndef CSMA_H_ +#define CSMA_H_ #include "net/mac/mac.h" #include "dev/radio.h" @@ -48,4 +48,4 @@ extern const struct mac_driver csma_driver; const struct mac_driver *csma_init(const struct mac_driver *r); -#endif /* __CSMA_H__ */ +#endif /* CSMA_H_ */ diff --git a/core/net/mac/cxmac.h b/core/net/mac/cxmac.h index 21f157a0a..ea55dece1 100644 --- a/core/net/mac/cxmac.h +++ b/core/net/mac/cxmac.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __CXMAC_H__ -#define __CXMAC_H__ +#ifndef CXMAC_H_ +#define CXMAC_H_ #include "sys/rtimer.h" #include "net/mac/rdc.h" @@ -60,4 +60,4 @@ struct cxmac_config { extern const struct rdc_driver cxmac_driver; -#endif /* __CXMAC_H__ */ +#endif /* CXMAC_H_ */ diff --git a/core/net/mac/framer-802154.h b/core/net/mac/framer-802154.h index 49a2368a8..fe4fced80 100644 --- a/core/net/mac/framer-802154.h +++ b/core/net/mac/framer-802154.h @@ -36,11 +36,11 @@ * Joakim Eriksson */ -#ifndef __FRAMER_802154_H__ -#define __FRAMER_802154_H__ +#ifndef FRAMER_802154_H_ +#define FRAMER_802154_H_ #include "net/mac/framer.h" extern const struct framer framer_802154; -#endif /* __FRAMER_802154_H__ */ +#endif /* FRAMER_802154_H_ */ diff --git a/core/net/mac/framer-nullmac.h b/core/net/mac/framer-nullmac.h index 9936cccac..b745393db 100644 --- a/core/net/mac/framer-nullmac.h +++ b/core/net/mac/framer-nullmac.h @@ -36,11 +36,11 @@ * Joakim Eriksson */ -#ifndef __FRAMER_NULLMAC_H__ -#define __FRAMER_NULLMAC_H__ +#ifndef FRAMER_NULLMAC_H_ +#define FRAMER_NULLMAC_H_ #include "net/mac/framer.h" extern const struct framer framer_nullmac; -#endif /* __FRAMER_NULLMAC_H__ */ +#endif /* FRAMER_NULLMAC_H_ */ diff --git a/core/net/mac/framer.h b/core/net/mac/framer.h index 00594e10d..3204dc0c9 100644 --- a/core/net/mac/framer.h +++ b/core/net/mac/framer.h @@ -38,8 +38,8 @@ * Joakim Eriksson */ -#ifndef __FRAMER_H__ -#define __FRAMER_H__ +#ifndef FRAMER_H_ +#define FRAMER_H_ #define FRAMER_FAILED -1 @@ -50,4 +50,4 @@ struct framer { }; -#endif /* __FRAMER_H__ */ +#endif /* FRAMER_H_ */ diff --git a/core/net/mac/lpp.h b/core/net/mac/lpp.h index 416d224d8..f80541476 100644 --- a/core/net/mac/lpp.h +++ b/core/net/mac/lpp.h @@ -40,12 +40,12 @@ * Adam Dunkels */ -#ifndef __LPP_H__ -#define __LPP_H__ +#ifndef LPP_H_ +#define LPP_H_ #include "net/mac/rdc.h" #include "dev/radio.h" extern const struct rdc_driver lpp_driver; -#endif /* __LPP_H__ */ +#endif /* LPP_H_ */ diff --git a/core/net/mac/mac.h b/core/net/mac/mac.h index 4dcc2c1de..8ab55bddd 100644 --- a/core/net/mac/mac.h +++ b/core/net/mac/mac.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __MAC_H__ -#define __MAC_H__ +#ifndef MAC_H_ +#define MAC_H_ #include "contiki-conf.h" #include "dev/radio.h" @@ -98,4 +98,4 @@ enum { MAC_TX_ERR_FATAL, }; -#endif /* __MAC_H__ */ +#endif /* MAC_H_ */ diff --git a/core/net/mac/nullmac.h b/core/net/mac/nullmac.h index 44820b3f0..6767bfc38 100644 --- a/core/net/mac/nullmac.h +++ b/core/net/mac/nullmac.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __NULLMAC_H__ -#define __NULLMAC_H__ +#ifndef NULLMAC_H_ +#define NULLMAC_H_ #include "net/mac/mac.h" #include "dev/radio.h" @@ -46,4 +46,4 @@ extern const struct mac_driver nullmac_driver; -#endif /* __NULLMAC_H__ */ +#endif /* NULLMAC_H_ */ diff --git a/core/net/mac/nullrdc-noframer.h b/core/net/mac/nullrdc-noframer.h index 8ba2cd458..fd66a37e5 100644 --- a/core/net/mac/nullrdc-noframer.h +++ b/core/net/mac/nullrdc-noframer.h @@ -37,12 +37,12 @@ * Adam Dunkels */ -#ifndef __NULLRDC_NOFRAMER_H__ -#define __NULLRDC_NOFRAMER_H__ +#ifndef NULLRDC_NOFRAMER_H_ +#define NULLRDC_NOFRAMER_H_ #include "net/mac/rdc.h" #include "dev/radio.h" extern const struct rdc_driver nullrdc_noframer_driver; -#endif /* __NULLRDC_NOFRAMER_H__ */ +#endif /* NULLRDC_NOFRAMER_H_ */ diff --git a/core/net/mac/nullrdc.h b/core/net/mac/nullrdc.h index f58cf5b56..48ac1c0f0 100644 --- a/core/net/mac/nullrdc.h +++ b/core/net/mac/nullrdc.h @@ -38,11 +38,11 @@ * Niclas Finne */ -#ifndef __NULLRDC_H__ -#define __NULLRDC_H__ +#ifndef NULLRDC_H_ +#define NULLRDC_H_ #include "net/mac/rdc.h" extern const struct rdc_driver nullrdc_driver; -#endif /* __NULLRDC_H__ */ +#endif /* NULLRDC_H_ */ diff --git a/core/net/mac/rdc.h b/core/net/mac/rdc.h index fe732eac3..9a47605b7 100644 --- a/core/net/mac/rdc.h +++ b/core/net/mac/rdc.h @@ -38,8 +38,8 @@ * Niclas Finne */ -#ifndef __RDC_H__ -#define __RDC_H__ +#ifndef RDC_H_ +#define RDC_H_ #include "contiki-conf.h" #include "net/mac/mac.h" @@ -79,4 +79,4 @@ struct rdc_driver { unsigned short (* channel_check_interval)(void); }; -#endif /* __RDC_H__ */ +#endif /* RDC_H_ */ diff --git a/core/net/mac/sicslowmac.h b/core/net/mac/sicslowmac.h index b96797d70..e7bf1a625 100644 --- a/core/net/mac/sicslowmac.h +++ b/core/net/mac/sicslowmac.h @@ -42,12 +42,12 @@ * Joakim Eriksson */ -#ifndef __SICSLOWMAC_H__ -#define __SICSLOWMAC_H__ +#ifndef SICSLOWMAC_H_ +#define SICSLOWMAC_H_ #include "net/mac/rdc.h" #include "dev/radio.h" extern const struct rdc_driver sicslowmac_driver; -#endif /* __SICSLOWMAC_H__ */ +#endif /* SICSLOWMAC_H_ */ diff --git a/core/net/mac/xmac.h b/core/net/mac/xmac.h index 8510b9eff..93991c391 100644 --- a/core/net/mac/xmac.h +++ b/core/net/mac/xmac.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __XMAC_H__ -#define __XMAC_H__ +#ifndef XMAC_H_ +#define XMAC_H_ #include "sys/rtimer.h" #include "net/mac/rdc.h" @@ -61,4 +61,4 @@ extern const struct rdc_driver xmac_driver; void xmac_set_announcement_radio_txpower(int txpower); -#endif /* __XMAC_H__ */ +#endif /* XMAC_H_ */ diff --git a/core/net/nbr-table.h b/core/net/nbr-table.h index 763c0d2a5..13130519b 100644 --- a/core/net/nbr-table.h +++ b/core/net/nbr-table.h @@ -32,8 +32,8 @@ * Joris Borms */ -#ifndef _NBR_TABLE_H_ -#define _NBR_TABLE_H_ +#ifndef NBR_TABLE_H_ +#define NBR_TABLE_H_ #include "contiki.h" #include "net/rime/rimeaddr.h" @@ -100,4 +100,4 @@ int nbr_table_unlock(nbr_table_t *table, nbr_table_item_t *item); rimeaddr_t *nbr_table_get_lladdr(nbr_table_t *table, const nbr_table_item_t *item); /** @} */ -#endif /* _NBR_TABLE_H_ */ +#endif /* NBR_TABLE_H_ */ diff --git a/core/net/packetbuf.h b/core/net/packetbuf.h index da16bd5e2..12d7b49d5 100644 --- a/core/net/packetbuf.h +++ b/core/net/packetbuf.h @@ -49,8 +49,8 @@ * Adam Dunkels */ -#ifndef __PACKETBUF_H__ -#define __PACKETBUF_H__ +#ifndef PACKETBUF_H_ +#define PACKETBUF_H_ #include "contiki-conf.h" #include "net/rime/rimeaddr.h" @@ -441,6 +441,6 @@ struct packetbuf_attrlist { uint8_t len; }; -#endif /* __PACKETBUF_H__ */ +#endif /* PACKETBUF_H_ */ /** @} */ /** @} */ diff --git a/core/net/packetqueue.h b/core/net/packetqueue.h index 45ccc980b..941313dc8 100644 --- a/core/net/packetqueue.h +++ b/core/net/packetqueue.h @@ -50,8 +50,8 @@ * Adam Dunkels */ -#ifndef __PACKETQUEUE_H__ -#define __PACKETQUEUE_H__ +#ifndef PACKETQUEUE_H_ +#define PACKETQUEUE_H_ #include "lib/list.h" #include "lib/memb.h" @@ -216,7 +216,7 @@ void *packetqueue_ptr(struct packetqueue_item *i); */ -#endif /* __PACKETQUEUE_H__ */ +#endif /* PACKETQUEUE_H_ */ /** @} */ /** @} */ diff --git a/core/net/psock.h b/core/net/psock.h index 0fb9233cd..07759b03d 100644 --- a/core/net/psock.h +++ b/core/net/psock.h @@ -83,8 +83,8 @@ * */ -#ifndef __PSOCK_H__ -#define __PSOCK_H__ +#ifndef PSOCK_H_ +#define PSOCK_H_ #include "contiki.h" #include "contiki-lib.h" @@ -398,7 +398,7 @@ char psock_newdata(struct psock *s); #define PSOCK_WAIT_THREAD(psock, condition) \ PT_WAIT_THREAD(&((psock)->pt), (condition)) -#endif /* __PSOCK_H__ */ +#endif /* PSOCK_H_ */ /** @} */ /** @} */ diff --git a/core/net/queuebuf.h b/core/net/queuebuf.h index d171ef043..8373753b0 100644 --- a/core/net/queuebuf.h +++ b/core/net/queuebuf.h @@ -50,8 +50,8 @@ * Adam Dunkels */ -#ifndef __QUEUEBUF_H__ -#define __QUEUEBUF_H__ +#ifndef QUEUEBUF_H_ +#define QUEUEBUF_H_ #include "net/packetbuf.h" @@ -108,7 +108,7 @@ packetbuf_attr_t queuebuf_attr(struct queuebuf *b, uint8_t type); void queuebuf_debug_print(void); -#endif /* __QUEUEBUF_H__ */ +#endif /* QUEUEBUF_H_ */ /** @} */ /** @} */ diff --git a/core/net/resolv.h b/core/net/resolv.h index 32a866bb9..6ef6d6ef0 100644 --- a/core/net/resolv.h +++ b/core/net/resolv.h @@ -36,8 +36,8 @@ * * */ -#ifndef __RESOLV_H__ -#define __RESOLV_H__ +#ifndef RESOLV_H_ +#define RESOLV_H_ #include "contiki.h" #include "uip.h" @@ -106,4 +106,4 @@ CCIF const char *resolv_get_hostname(void); PROCESS_NAME(resolv_process); -#endif /* __RESOLV_H__ */ +#endif /* RESOLV_H_ */ diff --git a/core/net/rime.h b/core/net/rime.h index 225c0112a..1087f7482 100644 --- a/core/net/rime.h +++ b/core/net/rime.h @@ -42,8 +42,8 @@ * Adam Dunkels */ -#ifndef __RIME_H__ -#define __RIME_H__ +#ifndef RIME_H_ +#define RIME_H_ #include "net/rime/announcement.h" #include "net/rime/collect.h" @@ -109,7 +109,7 @@ enum { RIME_ERR_CONTENTION, RIME_ERR_NOACK, }; -#endif /* __RIME_H__ */ +#endif /* RIME_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/abc.h b/core/net/rime/abc.h index b31a36684..19eebe053 100644 --- a/core/net/rime/abc.h +++ b/core/net/rime/abc.h @@ -54,8 +54,8 @@ * Adam Dunkels */ -#ifndef __ABC_H__ -#define __ABC_H__ +#ifndef ABC_H_ +#define ABC_H_ #include "net/packetbuf.h" #include "net/rime/channel.h" @@ -138,6 +138,6 @@ void abc_input(struct channel *channel); void abc_sent(struct channel *channel, int status, int num_tx); -#endif /* __ABC_H__ */ +#endif /* ABC_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/announcement.h b/core/net/rime/announcement.h index 46b59b651..e9809249a 100644 --- a/core/net/rime/announcement.h +++ b/core/net/rime/announcement.h @@ -63,8 +63,8 @@ * Adam Dunkels */ -#ifndef __ANNOUNCEMENT_H__ -#define __ANNOUNCEMENT_H__ +#ifndef ANNOUNCEMENT_H_ +#define ANNOUNCEMENT_H_ #include "net/rime/rimeaddr.h" @@ -267,7 +267,7 @@ void announcement_register_observer_callback(announcement_observer observer); * @} */ -#endif /* __ANNOUNCE_H__ */ +#endif /* ANNOUNCE_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/broadcast-announcement.h b/core/net/rime/broadcast-announcement.h index 1ec070a19..2e450b348 100644 --- a/core/net/rime/broadcast-announcement.h +++ b/core/net/rime/broadcast-announcement.h @@ -56,8 +56,8 @@ * Adam Dunkels */ -#ifndef __BROADCAST_ANNOUNCEMENT_H__ -#define __BROADCAST_ANNOUNCEMENT_H__ +#ifndef BROADCAST_ANNOUNCEMENT_H_ +#define BROADCAST_ANNOUNCEMENT_H_ void broadcast_announcement_init(uint16_t channel, clock_time_t bump_time, @@ -66,6 +66,6 @@ void broadcast_announcement_init(uint16_t channel, clock_time_t broadcast_announcement_beacon_interval(void); -#endif /* __BROADCAST_ANNOUNCEMENT_H__ */ +#endif /* BROADCAST_ANNOUNCEMENT_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/broadcast.h b/core/net/rime/broadcast.h index 169f8cb02..440564d95 100644 --- a/core/net/rime/broadcast.h +++ b/core/net/rime/broadcast.h @@ -62,8 +62,8 @@ * Adam Dunkels */ -#ifndef __BROADCAST_H__ -#define __BROADCAST_H__ +#ifndef BROADCAST_H_ +#define BROADCAST_H_ #include "net/rime/abc.h" #include "net/rime/rimeaddr.h" @@ -134,6 +134,6 @@ void broadcast_close(struct broadcast_conn *c); */ int broadcast_send(struct broadcast_conn *c); -#endif /* __BROADCAST_H__ */ +#endif /* BROADCAST_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/chameleon-bitopt.h b/core/net/rime/chameleon-bitopt.h index 83968215d..c9747a9b6 100644 --- a/core/net/rime/chameleon-bitopt.h +++ b/core/net/rime/chameleon-bitopt.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __CHAMELEON_BITOPT_H__ -#define __CHAMELEON_BITOPT_H__ +#ifndef CHAMELEON_BITOPT_H_ +#define CHAMELEON_BITOPT_H_ #include "sys/cc.h" extern CC_CONST_FUNCTION struct chameleon_module chameleon_bitopt; -#endif /* __CHAMELEON_BITOPT_H__ */ +#endif /* CHAMELEON_BITOPT_H_ */ diff --git a/core/net/rime/chameleon-raw.h b/core/net/rime/chameleon-raw.h index bcdd14745..214371ac3 100644 --- a/core/net/rime/chameleon-raw.h +++ b/core/net/rime/chameleon-raw.h @@ -37,11 +37,11 @@ * Adam Dunkels */ -#ifndef __CHAMELEON_RAW_H__ -#define __CHAMELEON_RAW_H__ +#ifndef CHAMELEON_RAW_H_ +#define CHAMELEON_RAW_H_ #include "sys/cc.h" extern CC_CONST_FUNCTION struct chameleon_module chameleon_raw; -#endif /* __CHAMELEON_RAW_H__ */ +#endif /* CHAMELEON_RAW_H_ */ diff --git a/core/net/rime/chameleon.h b/core/net/rime/chameleon.h index e63859bf4..145e78a6b 100644 --- a/core/net/rime/chameleon.h +++ b/core/net/rime/chameleon.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __CHAMELEON_H__ -#define __CHAMELEON_H__ +#ifndef CHAMELEON_H_ +#define CHAMELEON_H_ #include "net/rime/channel.h" @@ -54,4 +54,4 @@ int chameleon_hdrsize(const struct packetbuf_attrlist attrlist[]); struct channel *chameleon_parse(void); int chameleon_create(struct channel *c); -#endif /* __CHAMELEON_H__ */ +#endif /* CHAMELEON_H_ */ diff --git a/core/net/rime/channel.h b/core/net/rime/channel.h index f96a8f057..2a1e3e387 100644 --- a/core/net/rime/channel.h +++ b/core/net/rime/channel.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __CHANNEL_H__ -#define __CHANNEL_H__ +#ifndef CHANNEL_H_ +#define CHANNEL_H_ struct channel; @@ -61,4 +61,4 @@ void channel_open(struct channel *c, uint16_t channelno); void channel_close(struct channel *c); void channel_init(void); -#endif /* __CHANNEL_H__ */ +#endif /* CHANNEL_H_ */ diff --git a/core/net/rime/collect-neighbor.h b/core/net/rime/collect-neighbor.h index 1e7175546..cc6d11d49 100644 --- a/core/net/rime/collect-neighbor.h +++ b/core/net/rime/collect-neighbor.h @@ -48,8 +48,8 @@ * Adam Dunkels */ -#ifndef __COLLECT_NEIGHBOR_H__ -#define __COLLECT_NEIGHBOR_H__ +#ifndef COLLECT_NEIGHBOR_H_ +#define COLLECT_NEIGHBOR_H_ #include "net/rime/rimeaddr.h" #include "net/rime/collect-link-estimate.h" @@ -100,6 +100,6 @@ uint16_t collect_neighbor_rtmetric_link_estimate(struct collect_neighbor *n); uint16_t collect_neighbor_rtmetric(struct collect_neighbor *n); -#endif /* __COLLECT_NEIGHBOR_H__ */ +#endif /* COLLECT_NEIGHBOR_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/collect.h b/core/net/rime/collect.h index 3f2fccc1c..6d1ca249c 100644 --- a/core/net/rime/collect.h +++ b/core/net/rime/collect.h @@ -56,8 +56,8 @@ * Adam Dunkels */ -#ifndef __COLLECT_H__ -#define __COLLECT_H__ +#ifndef COLLECT_H_ +#define COLLECT_H_ #include "net/rime/announcement.h" #include "net/rime/runicast.h" @@ -144,6 +144,6 @@ void collect_print_stats(void); #define COLLECT_MAX_DEPTH (COLLECT_LINK_ESTIMATE_UNIT * 64 - 1) -#endif /* __COLLECT_H__ */ +#endif /* COLLECT_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/ipolite.h b/core/net/rime/ipolite.h index ebd1ec1d7..ee5a05bc7 100644 --- a/core/net/rime/ipolite.h +++ b/core/net/rime/ipolite.h @@ -90,8 +90,8 @@ * Adam Dunkels */ -#ifndef __IPOLITE_H__ -#define __IPOLITE_H__ +#ifndef IPOLITE_H_ +#define IPOLITE_H_ #include "sys/ctimer.h" @@ -191,7 +191,7 @@ int ipolite_send(struct ipolite_conn *c, clock_time_t interval, */ void ipolite_cancel(struct ipolite_conn *c); -#endif /* __IPOLITE_H__ */ +#endif /* IPOLITE_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/mesh.h b/core/net/rime/mesh.h index 394e428a5..e80f69235 100644 --- a/core/net/rime/mesh.h +++ b/core/net/rime/mesh.h @@ -58,8 +58,8 @@ * Adam Dunkels */ -#ifndef __MESH_H__ -#define __MESH_H__ +#ifndef MESH_H_ +#define MESH_H_ #include "net/queuebuf.h" #include "net/rime/multihop.h" @@ -141,6 +141,6 @@ int mesh_send(struct mesh_conn *c, const rimeaddr_t *dest); */ int mesh_ready(struct mesh_conn *c); -#endif /* __MESH_H__ */ +#endif /* MESH_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/multihop.h b/core/net/rime/multihop.h index 9fba72328..ccb5d5845 100644 --- a/core/net/rime/multihop.h +++ b/core/net/rime/multihop.h @@ -67,8 +67,8 @@ * Adam Dunkels */ -#ifndef __MULTIHOP_H__ -#define __MULTIHOP_H__ +#ifndef MULTIHOP_H_ +#define MULTIHOP_H_ #include "net/rime/unicast.h" #include "net/rime/rimeaddr.h" @@ -105,6 +105,6 @@ void multihop_close(struct multihop_conn *c); int multihop_send(struct multihop_conn *c, const rimeaddr_t *to); void multihop_resend(struct multihop_conn *c, const rimeaddr_t *nexthop); -#endif /* __MULTIHOP_H__ */ +#endif /* MULTIHOP_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/neighbor-discovery.h b/core/net/rime/neighbor-discovery.h index d4745c1dc..347c01c09 100644 --- a/core/net/rime/neighbor-discovery.h +++ b/core/net/rime/neighbor-discovery.h @@ -56,8 +56,8 @@ * Adam Dunkels */ -#ifndef __NEIGHBOR_DISCOVERY_H__ -#define __NEIGHBOR_DISCOVERY_H__ +#ifndef NEIGHBOR_DISCOVERY_H_ +#define NEIGHBOR_DISCOVERY_H_ #include "net/rime/broadcast.h" #include "sys/ctimer.h" @@ -90,6 +90,6 @@ void neighbor_discovery_set_val(struct neighbor_discovery_conn *c, uint16_t val) void neighbor_discovery_start(struct neighbor_discovery_conn *c, uint16_t val); -#endif /* __NEIGHBOR_DISCOVERY_H__ */ +#endif /* NEIGHBOR_DISCOVERY_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/netflood.h b/core/net/rime/netflood.h index 6bc777f7a..2b1ea65e2 100644 --- a/core/net/rime/netflood.h +++ b/core/net/rime/netflood.h @@ -71,8 +71,8 @@ * Adam Dunkels */ -#ifndef __NETFLOOD_H__ -#define __NETFLOOD_H__ +#ifndef NETFLOOD_H_ +#define NETFLOOD_H_ #include "net/queuebuf.h" #include "net/rime/ipolite.h" @@ -105,6 +105,6 @@ void netflood_close(struct netflood_conn *c); int netflood_send(struct netflood_conn *c, uint8_t seqno); -#endif /* __SIBC_H__ */ +#endif /* SIBC_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/polite-announcement.h b/core/net/rime/polite-announcement.h index 32f7b3663..a79f1c560 100644 --- a/core/net/rime/polite-announcement.h +++ b/core/net/rime/polite-announcement.h @@ -56,13 +56,13 @@ * Adam Dunkels */ -#ifndef __POLITE_ANNOUNCEMENT_H__ -#define __POLITE_ANNOUNCEMENT_H__ +#ifndef POLITE_ANNOUNCEMENT_H_ +#define POLITE_ANNOUNCEMENT_H_ void polite_announcement_init(uint16_t channel, clock_time_t min, clock_time_t max); -#endif /* __POLITE_ANNOUNCEMENT_H__ */ +#endif /* POLITE_ANNOUNCEMENT_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/polite.h b/core/net/rime/polite.h index 286eb1dca..e521c3e6c 100644 --- a/core/net/rime/polite.h +++ b/core/net/rime/polite.h @@ -90,8 +90,8 @@ * Adam Dunkels */ -#ifndef __POLITE_H__ -#define __POLITE_H__ +#ifndef POLITE_H_ +#define POLITE_H_ #include "net/rime/abc.h" #include "net/queuebuf.h" @@ -186,7 +186,7 @@ int polite_send(struct polite_conn *c, clock_time_t interval, uint8_t hdrsize); */ void polite_cancel(struct polite_conn *c); -#endif /* __POLITE_H__ */ +#endif /* POLITE_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/rime-udp.h b/core/net/rime/rime-udp.h index 7c449a1bd..35a446e3b 100644 --- a/core/net/rime/rime-udp.h +++ b/core/net/rime/rime-udp.h @@ -37,12 +37,12 @@ * Nicolas Tsiftes */ -#ifndef __UDPMAC_H__ -#define __UDPMAC_H__ +#ifndef UDPMAC_H_ +#define UDPMAC_H_ #include "net/mac/mac.h" #include "dev/radio.h" extern const struct mac_driver rime_udp_driver; -#endif /* __UDPMAC_H__ */ +#endif /* UDPMAC_H_ */ diff --git a/core/net/rime/rimeaddr.h b/core/net/rime/rimeaddr.h index 962b4389c..3bc39f7dd 100644 --- a/core/net/rime/rimeaddr.h +++ b/core/net/rime/rimeaddr.h @@ -51,8 +51,8 @@ * Adam Dunkels */ -#ifndef __RIMEADDR_H__ -#define __RIMEADDR_H__ +#ifndef RIMEADDR_H_ +#define RIMEADDR_H_ #include "contiki-conf.h" @@ -126,6 +126,6 @@ extern rimeaddr_t rimeaddr_node_addr; */ extern const rimeaddr_t rimeaddr_null; -#endif /* __RIMEADDR_H__ */ +#endif /* RIMEADDR_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/rimestats.h b/core/net/rime/rimestats.h index abdc509de..606ca5d22 100644 --- a/core/net/rime/rimestats.h +++ b/core/net/rime/rimestats.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __RIMESTATS_H__ -#define __RIMESTATS_H__ +#ifndef RIMESTATS_H_ +#define RIMESTATS_H_ struct rimestats { unsigned long tx, rx; @@ -66,4 +66,4 @@ extern struct rimestats rimestats; #define RIMESTATS_GET(x) 0 #endif /* RIMESTATS_CONF_ENABLED */ -#endif /* __RIMESTATS_H__ */ +#endif /* RIMESTATS_H_ */ diff --git a/core/net/rime/rmh.h b/core/net/rime/rmh.h index f23c5ac3a..a1216af33 100644 --- a/core/net/rime/rmh.h +++ b/core/net/rime/rmh.h @@ -62,8 +62,8 @@ * Adam Dunkels */ -#ifndef __RMH_H__ -#define __RMH_H__ +#ifndef RMH_H_ +#define RMH_H_ #include "net/rime/runicast.h" #include "net/rime/rimeaddr.h" @@ -97,6 +97,6 @@ void rmh_close(struct rmh_conn *c); int rmh_send(struct rmh_conn *c, rimeaddr_t *to, uint8_t num_rexmit, uint8_t max_hops); -#endif /* __RMH_H__ */ +#endif /* RMH_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/route-discovery.h b/core/net/rime/route-discovery.h index dd8c7c465..ec8a7814a 100644 --- a/core/net/rime/route-discovery.h +++ b/core/net/rime/route-discovery.h @@ -54,8 +54,8 @@ * Adam Dunkels */ -#ifndef __ROUTE_DISCOVERY_H__ -#define __ROUTE_DISCOVERY_H__ +#ifndef ROUTE_DISCOVERY_H_ +#define ROUTE_DISCOVERY_H_ #include "net/rime/unicast.h" #include "net/rime/netflood.h" @@ -88,6 +88,6 @@ int route_discovery_discover(struct route_discovery_conn *c, const rimeaddr_t *d void route_discovery_close(struct route_discovery_conn *c); -#endif /* __ROUTE_DISCOVERY_H__ */ +#endif /* ROUTE_DISCOVERY_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/route.h b/core/net/rime/route.h index 6e24b872d..caa65ba70 100644 --- a/core/net/rime/route.h +++ b/core/net/rime/route.h @@ -48,8 +48,8 @@ * Adam Dunkels */ -#ifndef __ROUTE_H__ -#define __ROUTE_H__ +#ifndef ROUTE_H_ +#define ROUTE_H_ #include "net/rime/rimeaddr.h" @@ -78,6 +78,6 @@ void route_set_lifetime(int seconds); int route_num(void); struct route_entry *route_get(int num); -#endif /* __ROUTE_H__ */ +#endif /* ROUTE_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/rucb.h b/core/net/rime/rucb.h index f4007e1a2..5dc53bdbd 100644 --- a/core/net/rime/rucb.h +++ b/core/net/rime/rucb.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __RUCB_H__ -#define __RUCB_H__ +#ifndef RUCB_H_ +#define RUCB_H_ #include "net/rime/runicast.h" @@ -76,4 +76,4 @@ void rucb_close(struct rucb_conn *c); int rucb_send(struct rucb_conn *c, const rimeaddr_t *receiver); -#endif /* __RUCB_H__ */ +#endif /* RUCB_H_ */ diff --git a/core/net/rime/rudolph0.h b/core/net/rime/rudolph0.h index ade55f8e3..9b62e4f4f 100644 --- a/core/net/rime/rudolph0.h +++ b/core/net/rime/rudolph0.h @@ -56,8 +56,8 @@ * Adam Dunkels */ -#ifndef __RUDOLPH0_H__ -#define __RUDOLPH0_H__ +#ifndef RUDOLPH0_H_ +#define RUDOLPH0_H_ #include "net/rime/stbroadcast.h" #include "net/rime/polite.h" @@ -116,7 +116,7 @@ void rudolph0_force_restart(struct rudolph0_conn *c); void rudolph0_set_version(struct rudolph0_conn *c, int version); int rudolph0_version(struct rudolph0_conn *c); -#endif /* __RUDOLPH0_H__ */ +#endif /* RUDOLPH0_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/rudolph1.h b/core/net/rime/rudolph1.h index 6276322bd..a9e54ae70 100644 --- a/core/net/rime/rudolph1.h +++ b/core/net/rime/rudolph1.h @@ -56,8 +56,8 @@ * Adam Dunkels */ -#ifndef __RUDOLPH1_H__ -#define __RUDOLPH1_H__ +#ifndef RUDOLPH1_H_ +#define RUDOLPH1_H_ #include "net/rime/trickle.h" #include "net/rime/ipolite.h" @@ -96,6 +96,6 @@ void rudolph1_close(struct rudolph1_conn *c); void rudolph1_send(struct rudolph1_conn *c, clock_time_t send_interval); void rudolph1_stop(struct rudolph1_conn *c); -#endif /* __RUDOLPH1_H__ */ +#endif /* RUDOLPH1_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/rudolph2.h b/core/net/rime/rudolph2.h index 0f88209c4..7307b573d 100644 --- a/core/net/rime/rudolph2.h +++ b/core/net/rime/rudolph2.h @@ -56,8 +56,8 @@ * Adam Dunkels */ -#ifndef __RUDOLPH2_H__ -#define __RUDOLPH2_H__ +#ifndef RUDOLPH2_H_ +#define RUDOLPH2_H_ #include "net/rime/polite.h" #include "sys/ctimer.h" @@ -99,7 +99,7 @@ void rudolph2_stop(struct rudolph2_conn *c); void rudolph2_set_version(struct rudolph2_conn *c, int version); int rudolph2_version(struct rudolph2_conn *c); -#endif /* __RUDOLPH2_H__ */ +#endif /* RUDOLPH2_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/runicast.h b/core/net/rime/runicast.h index 84cc90f02..069e452c8 100644 --- a/core/net/rime/runicast.h +++ b/core/net/rime/runicast.h @@ -75,8 +75,8 @@ * Adam Dunkels */ -#ifndef __RUNICAST_H__ -#define __RUNICAST_H__ +#ifndef RUNICAST_H_ +#define RUNICAST_H_ #include "net/rime/stunicast.h" @@ -112,6 +112,6 @@ int runicast_send(struct runicast_conn *c, const rimeaddr_t *receiver, uint8_t runicast_is_transmitting(struct runicast_conn *c); -#endif /* __RUNICAST_H__ */ +#endif /* RUNICAST_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/stbroadcast.h b/core/net/rime/stbroadcast.h index 8fc24f995..6d7f175ee 100644 --- a/core/net/rime/stbroadcast.h +++ b/core/net/rime/stbroadcast.h @@ -57,8 +57,8 @@ * Adam Dunkels */ -#ifndef __STBROADCAST_H__ -#define __STBROADCAST_H__ +#ifndef STBROADCAST_H_ +#define STBROADCAST_H_ #include "sys/ctimer.h" @@ -147,7 +147,7 @@ void stbroadcast_cancel(struct stbroadcast_conn *c); */ void stbroadcast_set_timer(struct stbroadcast_conn *c, clock_time_t t); -#endif /* __STBROADCAST_H__ */ +#endif /* STBROADCAST_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/stunicast.h b/core/net/rime/stunicast.h index 24a900e9a..8cf3a4aac 100644 --- a/core/net/rime/stunicast.h +++ b/core/net/rime/stunicast.h @@ -69,8 +69,8 @@ * Adam Dunkels */ -#ifndef __STUNICAST_H__ -#define __STUNICAST_H__ +#ifndef STUNICAST_H_ +#define STUNICAST_H_ #include "sys/ctimer.h" #include "net/rime/unicast.h" @@ -107,6 +107,6 @@ void stunicast_set_timer(struct stunicast_conn *c, clock_time_t t); rimeaddr_t *stunicast_receiver(struct stunicast_conn *c); -#endif /* __STUNICAST_H__ */ +#endif /* STUNICAST_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/timesynch.h b/core/net/rime/timesynch.h index f8b12f535..a17af5064 100644 --- a/core/net/rime/timesynch.h +++ b/core/net/rime/timesynch.h @@ -64,8 +64,8 @@ * Adam Dunkels */ -#ifndef __TIMESYNCH_H__ -#define __TIMESYNCH_H__ +#ifndef TIMESYNCH_H_ +#define TIMESYNCH_H_ #include "net/mac/mac.h" #include "sys/rtimer.h" @@ -144,7 +144,7 @@ int timesynch_authority_level(void); */ void timesynch_set_authority_level(int level); -#endif /* __TIMESYNCH_H__ */ +#endif /* TIMESYNCH_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/trickle.h b/core/net/rime/trickle.h index a3430c432..4dc0fdd0f 100644 --- a/core/net/rime/trickle.h +++ b/core/net/rime/trickle.h @@ -54,8 +54,8 @@ * Adam Dunkels */ -#ifndef __TRICKLE_H__ -#define __TRICKLE_H__ +#ifndef TRICKLE_H_ +#define TRICKLE_H_ #include "sys/ctimer.h" @@ -89,6 +89,6 @@ void trickle_close(struct trickle_conn *c); void trickle_send(struct trickle_conn *c); -#endif /* __TRICKLE_H__ */ +#endif /* TRICKLE_H_ */ /** @} */ /** @} */ diff --git a/core/net/rime/unicast.h b/core/net/rime/unicast.h index 1df37b6dd..b2924b97e 100644 --- a/core/net/rime/unicast.h +++ b/core/net/rime/unicast.h @@ -59,8 +59,8 @@ * Adam Dunkels */ -#ifndef __UNICAST_H__ -#define __UNICAST_H__ +#ifndef UNICAST_H_ +#define UNICAST_H_ #include "net/rime/broadcast.h" @@ -85,6 +85,6 @@ void unicast_close(struct unicast_conn *c); int unicast_send(struct unicast_conn *c, const rimeaddr_t *receiver); -#endif /* __UNICAST_H__ */ +#endif /* UNICAST_H_ */ /** @} */ /** @} */ diff --git a/core/net/sicslowpan.h b/core/net/sicslowpan.h index f4a3bc562..2b37f4fdb 100644 --- a/core/net/sicslowpan.h +++ b/core/net/sicslowpan.h @@ -45,8 +45,8 @@ * \author Julien Abeille */ -#ifndef __SICSLOWPAN_H__ -#define __SICSLOWPAN_H__ +#ifndef SICSLOWPAN_H_ +#define SICSLOWPAN_H_ #include "net/uip.h" #include "net/mac/mac.h" @@ -320,5 +320,5 @@ struct sicslowpan_nh_compressor { extern const struct network_driver sicslowpan_driver; -#endif /* __SICSLOWPAN_H__ */ +#endif /* SICSLOWPAN_H_ */ /** @} */ diff --git a/core/net/slipdev.h b/core/net/slipdev.h index 4026162ee..105461a59 100644 --- a/core/net/slipdev.h +++ b/core/net/slipdev.h @@ -42,8 +42,8 @@ * */ -#ifndef __SLIPDEV_H__ -#define __SLIPDEV_H__ +#ifndef SLIPDEV_H_ +#define SLIPDEV_H_ #include "uip.h" @@ -82,6 +82,6 @@ void slipdev_init(void); uint8_t slipdev_send(void); uint16_t slipdev_poll(void); -#endif /* __SLIPDEV_H__ */ +#endif /* SLIPDEV_H_ */ /** @} */ diff --git a/core/net/tcpip.h b/core/net/tcpip.h index bb4b412b5..1c968f1aa 100644 --- a/core/net/tcpip.h +++ b/core/net/tcpip.h @@ -63,8 +63,8 @@ * Author: Adam Dunkels * */ -#ifndef __TCPIP_H__ -#define __TCPIP_H__ +#ifndef TCPIP_H_ +#define TCPIP_H_ #include "contiki.h" @@ -371,7 +371,7 @@ extern unsigned char tcpip_is_forwarding; PROCESS_NAME(tcpip_process); -#endif /* __TCPIP_H__ */ +#endif /* TCPIP_H_ */ /** @} */ /** @} */ diff --git a/core/net/uaodv-def.h b/core/net/uaodv-def.h index 87592a6cd..520e897da 100644 --- a/core/net/uaodv-def.h +++ b/core/net/uaodv-def.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __UAODV_DEF_H__ -#define __UAODV_DEF_H__ +#ifndef UAODV_DEF_H_ +#define UAODV_DEF_H_ #include "net/uip.h" @@ -142,4 +142,4 @@ struct uaodv_bad_hop_ext { uip_ipaddr_t addrs[1]; }; -#endif /* __UAODV_DEF_H__ */ +#endif /* UAODV_DEF_H_ */ diff --git a/core/net/uaodv-rt.h b/core/net/uaodv-rt.h index cae943fdf..aa5964116 100644 --- a/core/net/uaodv-rt.h +++ b/core/net/uaodv-rt.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __UAODV_RT_H__ -#define __UAODV_RT_H__ +#ifndef UAODV_RT_H_ +#define UAODV_RT_H_ #include "contiki-net.h" @@ -60,4 +60,4 @@ void uaodv_rt_remove(struct uaodv_rt_entry *e); void uaodv_rt_lru(struct uaodv_rt_entry *e); void uaodv_rt_flush_all(void); -#endif /* __UAODV_RT_H__ */ +#endif /* UAODV_RT_H_ */ diff --git a/core/net/uaodv.h b/core/net/uaodv.h index 3b60ffd4f..c10484cdd 100644 --- a/core/net/uaodv.h +++ b/core/net/uaodv.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __UAODV_H__ -#define __UAODV_H__ +#ifndef UAODV_H_ +#define UAODV_H_ #include "contiki.h" #include "uaodv-rt.h" @@ -48,4 +48,4 @@ PROCESS_NAME(uaodv_process); struct uaodv_rt_entry * uaodv_request_route_to(uip_ipaddr_t *host); void uaodv_bad_dest(uip_ipaddr_t *); -#endif /* __UAODV_H__ */ +#endif /* UAODV_H_ */ diff --git a/core/net/uip-ds6-nbr.h b/core/net/uip-ds6-nbr.h index 059162710..4fe190533 100644 --- a/core/net/uip-ds6-nbr.h +++ b/core/net/uip-ds6-nbr.h @@ -43,8 +43,8 @@ * */ -#ifndef __UIP_DS6_NEIGHBOR_H__ -#define __UIP_DS6_NEIGHBOR_H__ +#ifndef UIP_DS6_NEIGHBOR_H_ +#define UIP_DS6_NEIGHBOR_H_ #include "net/uip.h" #include "net/nbr-table.h" @@ -107,4 +107,4 @@ int uip_ds6_nbr_num(void); */ uip_ds6_nbr_t *uip_ds6_get_least_lifetime_neighbor(void); -#endif /* __UIP_DS6_NEIGHBOR_H__ */ +#endif /* UIP_DS6_NEIGHBOR_H_ */ diff --git a/core/net/uip-ds6.h b/core/net/uip-ds6.h index 1d6c2e759..93dcd6868 100644 --- a/core/net/uip-ds6.h +++ b/core/net/uip-ds6.h @@ -39,8 +39,8 @@ * */ -#ifndef __UIP_DS6_H__ -#define __UIP_DS6_H__ +#ifndef UIP_DS6_H_ +#define UIP_DS6_H_ #include "net/uip.h" #include "sys/stimer.h" @@ -337,4 +337,4 @@ uint32_t uip_ds6_compute_reachable_time(void); /** \brief compute random reachab /** @} */ /** @} */ -#endif /* __UIP_DS6_H__ */ +#endif /* UIP_DS6_H_ */ diff --git a/core/net/uip-fw-drv.h b/core/net/uip-fw-drv.h index ecc5f54e7..478022016 100644 --- a/core/net/uip-fw-drv.h +++ b/core/net/uip-fw-drv.h @@ -31,12 +31,12 @@ * Author: Adam Dunkels * */ -#ifndef __UIP_FW_DRV_H__ -#define __UIP_FW_DRV_H__ +#ifndef UIP_FW_DRV_H_ +#define UIP_FW_DRV_H_ #include "contiki.h" #include "net/uip-fw.h" PROCESS_NAME(uip_fw_process); -#endif /* __UIP_FW_DRV_H__ */ +#endif /* UIP_FW_DRV_H_ */ diff --git a/core/net/uip-fw.h b/core/net/uip-fw.h index a77adf761..d662651b9 100644 --- a/core/net/uip-fw.h +++ b/core/net/uip-fw.h @@ -42,8 +42,8 @@ * Author: Adam Dunkels * */ -#ifndef __UIP_FW_H__ -#define __UIP_FW_H__ +#ifndef UIP_FW_H_ +#define UIP_FW_H_ #include "net/uip.h" @@ -170,6 +170,6 @@ void uip_fw_periodic(void); #define UIP_FW_DROPPED 5 -#endif /* __UIP_FW_H__ */ +#endif /* UIP_FW_H_ */ /** @} */ diff --git a/core/net/uip-icmp6.h b/core/net/uip-icmp6.h index ca4b576bf..add6d7053 100644 --- a/core/net/uip-icmp6.h +++ b/core/net/uip-icmp6.h @@ -43,8 +43,8 @@ */ -#ifndef __ICMP6_H__ -#define __ICMP6_H__ +#ifndef ICMP6_H_ +#define ICMP6_H_ #include "net/uip.h" @@ -135,6 +135,6 @@ uip_icmp6_send(uip_ipaddr_t *dest, int type, int code, int payload_len); /** @} */ -#endif /*__ICMP6_H__*/ +#endif /*ICMP6_H_*/ /** @} */ diff --git a/core/net/uip-nd6.h b/core/net/uip-nd6.h index b4b97889f..de6412899 100644 --- a/core/net/uip-nd6.h +++ b/core/net/uip-nd6.h @@ -42,8 +42,8 @@ * */ -#ifndef __UIP_ND6_H__ -#define __UIP_ND6_H__ +#ifndef UIP_ND6_H_ +#define UIP_ND6_H_ #include "net/uip.h" #include "sys/stimer.h" @@ -562,6 +562,6 @@ uip_appserver_addr_get(uip_ipaddr_t *ipaddr); * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ * */ -#endif /* __UIP_ND6_H__ */ +#endif /* UIP_ND6_H_ */ /** @} */ diff --git a/core/net/uip-neighbor.h b/core/net/uip-neighbor.h index 7fa7b4a35..5825f962d 100644 --- a/core/net/uip-neighbor.h +++ b/core/net/uip-neighbor.h @@ -38,8 +38,8 @@ * Adam Dunkels */ -#ifndef __UIP_NEIGHBOR_H__ -#define __UIP_NEIGHBOR_H__ +#ifndef UIP_NEIGHBOR_H_ +#define UIP_NEIGHBOR_H_ #include "net/uip.h" @@ -57,4 +57,4 @@ void uip_neighbor_update(uip_ipaddr_t *ipaddr); struct uip_neighbor_addr *uip_neighbor_lookup(uip_ipaddr_t *ipaddr); void uip_neighbor_periodic(void); -#endif /* __UIP-NEIGHBOR_H__ */ +#endif /* UIP-NEIGHBOR_H_ */ diff --git a/core/net/uip-over-mesh.h b/core/net/uip-over-mesh.h index 248d75c45..332b7784c 100644 --- a/core/net/uip-over-mesh.h +++ b/core/net/uip-over-mesh.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __UIP_OVER_MESH_H__ -#define __UIP_OVER_MESH_H__ +#ifndef UIP_OVER_MESH_H_ +#define UIP_OVER_MESH_H_ #include "net/uip.h" #include "net/uip-fw.h" @@ -53,4 +53,4 @@ void uip_over_mesh_set_net(uip_ipaddr_t *addr, uip_ipaddr_t *mask); void uip_over_mesh_make_announced_gateway(void); -#endif /* __UIP-OVER-MESH_H__ */ +#endif /* UIP-OVER-MESH_H_ */ diff --git a/core/net/uip-split.h b/core/net/uip-split.h index 2cea7203f..49f55fba6 100644 --- a/core/net/uip-split.h +++ b/core/net/uip-split.h @@ -68,8 +68,8 @@ * */ -#ifndef __UIP_SPLIT_H__ -#define __UIP_SPLIT_H__ +#ifndef UIP_SPLIT_H_ +#define UIP_SPLIT_H_ /** * Handle outgoing packets. @@ -89,7 +89,7 @@ */ void uip_split_output(void); -#endif /* __UIP_SPLIT_H__ */ +#endif /* UIP_SPLIT_H_ */ /** @} */ /** @} */ diff --git a/core/net/uip-udp-packet.h b/core/net/uip-udp-packet.h index 70a4a0fc3..294919f6e 100644 --- a/core/net/uip-udp-packet.h +++ b/core/net/uip-udp-packet.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __UIP_UDP_PACKET_H__ -#define __UIP_UDP_PACKET_H__ +#ifndef UIP_UDP_PACKET_H_ +#define UIP_UDP_PACKET_H_ #include "net/uip.h" @@ -46,4 +46,4 @@ void uip_udp_packet_send(struct uip_udp_conn *c, const void *data, int len); void uip_udp_packet_sendto(struct uip_udp_conn *c, const void *data, int len, const uip_ipaddr_t *toaddr, uint16_t toport); -#endif /* __UIP_UDP_PACKET_H__ */ +#endif /* UIP_UDP_PACKET_H_ */ diff --git a/core/net/uip.h b/core/net/uip.h index dc25e2f1f..c4df7cff0 100644 --- a/core/net/uip.h +++ b/core/net/uip.h @@ -50,8 +50,8 @@ * */ -#ifndef __UIP_H__ -#define __UIP_H__ +#ifndef UIP_H_ +#define UIP_H_ #include "net/uipopt.h" @@ -2193,7 +2193,7 @@ uint16_t uip_udpchksum(void); uint16_t uip_icmp6chksum(void); -#endif /* __UIP_H__ */ +#endif /* UIP_H_ */ /** @} */ diff --git a/core/net/uip_arch.h b/core/net/uip_arch.h index b035ee3ef..bdef2b512 100644 --- a/core/net/uip_arch.h +++ b/core/net/uip_arch.h @@ -57,8 +57,8 @@ * */ -#ifndef __UIP_ARCH_H__ -#define __UIP_ARCH_H__ +#ifndef UIP_ARCH_H_ +#define UIP_ARCH_H_ #include "net/uip.h" @@ -134,4 +134,4 @@ uint16_t uip_udpchksum(void); /** @} */ /** @} */ -#endif /* __UIP_ARCH_H__ */ +#endif /* UIP_ARCH_H_ */ diff --git a/core/net/uip_arp.h b/core/net/uip_arp.h index 1eb810448..604a34370 100644 --- a/core/net/uip_arp.h +++ b/core/net/uip_arp.h @@ -48,8 +48,8 @@ * */ -#ifndef __UIP_ARP_H__ -#define __UIP_ARP_H__ +#ifndef UIP_ARP_H_ +#define UIP_ARP_H_ #include "net/uip.h" @@ -139,5 +139,5 @@ void uip_arp_timer(void); /** @} */ -#endif /* __UIP_ARP_H__ */ +#endif /* UIP_ARP_H_ */ /** @} */ diff --git a/core/net/uiplib.h b/core/net/uiplib.h index de446de59..9c40bdc1c 100644 --- a/core/net/uiplib.h +++ b/core/net/uiplib.h @@ -39,8 +39,8 @@ * * */ -#ifndef __UIPLIB_H__ -#define __UIPLIB_H__ +#ifndef UIPLIB_H_ +#define UIPLIB_H_ #include "net/uip.h" @@ -76,4 +76,4 @@ CCIF int uiplib_ip4addrconv(const char *addrstr, uip_ip4addr_t *addr); CCIF int uiplib_ip6addrconv(const char *addrstr, uip_ip6addr_t *addr); /** @} */ -#endif /* __UIPLIB_H__ */ +#endif /* UIPLIB_H_ */ diff --git a/core/net/uipopt.h b/core/net/uipopt.h index 7c9939003..39a49a55f 100644 --- a/core/net/uipopt.h +++ b/core/net/uipopt.h @@ -61,8 +61,8 @@ * */ -#ifndef __UIPOPT_H__ -#define __UIPOPT_H__ +#ifndef UIPOPT_H_ +#define UIPOPT_H_ #ifndef UIP_LITTLE_ENDIAN #define UIP_LITTLE_ENDIAN 3412 @@ -672,6 +672,6 @@ void uip_log(char *msg); */ /** @} */ -#endif /* __UIPOPT_H__ */ +#endif /* UIPOPT_H_ */ /** @} */ /** @} */ diff --git a/core/sys/arg.h b/core/sys/arg.h index df1ceb67d..6c2d0eb19 100644 --- a/core/sys/arg.h +++ b/core/sys/arg.h @@ -31,12 +31,12 @@ * * */ -#ifndef __ARG_H__ -#define __ARG_H__ +#ifndef ARG_H_ +#define ARG_H_ void arg_init(void); char *arg_alloc(char size); void arg_free(char *arg); -#endif /* __ARG_H__ */ +#endif /* ARG_H_ */ diff --git a/core/sys/autostart.h b/core/sys/autostart.h index 46c3333b8..a88dbd6b6 100644 --- a/core/sys/autostart.h +++ b/core/sys/autostart.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __AUTOSTART_H__ -#define __AUTOSTART_H__ +#ifndef AUTOSTART_H_ +#define AUTOSTART_H_ #include "sys/process.h" @@ -59,4 +59,4 @@ CLIF extern struct process * const autostart_processes[]; void autostart_start(struct process * const processes[]); void autostart_exit(struct process * const processes[]); -#endif /* __AUTOSTART_H__ */ +#endif /* AUTOSTART_H_ */ diff --git a/core/sys/cc.h b/core/sys/cc.h index f4a6105a1..2fd9c2208 100644 --- a/core/sys/cc.h +++ b/core/sys/cc.h @@ -41,8 +41,8 @@ * * */ -#ifndef __CC_H__ -#define __CC_H__ +#ifndef CC_H_ +#define CC_H_ #include "contiki-conf.h" @@ -136,4 +136,4 @@ */ #define CC_CONCAT(s1, s2) CC_CONCAT2(s1, s2) -#endif /* __CC_H__ */ +#endif /* CC_H_ */ diff --git a/core/sys/clock.h b/core/sys/clock.h index 986f6ae33..bbf5988ee 100644 --- a/core/sys/clock.h +++ b/core/sys/clock.h @@ -65,8 +65,8 @@ * Author: Adam Dunkels * */ -#ifndef __CLOCK_H__ -#define __CLOCK_H__ +#ifndef CLOCK_H_ +#define CLOCK_H_ #include "contiki-conf.h" @@ -139,7 +139,7 @@ int clock_fine_max(void); unsigned short clock_fine(void); void clock_delay(unsigned int delay); -#endif /* __CLOCK_H__ */ +#endif /* CLOCK_H_ */ /** @} */ /** @} */ diff --git a/core/sys/compower.h b/core/sys/compower.h index 60866f660..202065eb3 100644 --- a/core/sys/compower.h +++ b/core/sys/compower.h @@ -51,8 +51,8 @@ * Adam Dunkels */ -#ifndef __COMPOWER_H__ -#define __COMPOWER_H__ +#ifndef COMPOWER_H_ +#define COMPOWER_H_ /** * \brief An activity record that contains power consumption information for a specific communication activity. @@ -129,7 +129,7 @@ void compower_attrconv(struct compower_activity *a); */ void compower_accumulate_attrs(struct compower_activity *a); -#endif /* __COMPOWER_H__ */ +#endif /* COMPOWER_H_ */ /** @} */ /** @} */ diff --git a/core/sys/ctimer.h b/core/sys/ctimer.h index bc7bf2f98..27311ddfb 100644 --- a/core/sys/ctimer.h +++ b/core/sys/ctimer.h @@ -51,8 +51,8 @@ * Adam Dunkels */ -#ifndef __CTIMER_H__ -#define __CTIMER_H__ +#ifndef CTIMER_H_ +#define CTIMER_H_ #include "sys/etimer.h" @@ -143,6 +143,6 @@ int ctimer_expired(struct ctimer *c); */ void ctimer_init(void); -#endif /* __CTIMER_H__ */ +#endif /* CTIMER_H_ */ /** @} */ /** @} */ diff --git a/core/sys/dsc.h b/core/sys/dsc.h index 75ba4d9a9..5c3994741 100644 --- a/core/sys/dsc.h +++ b/core/sys/dsc.h @@ -58,8 +58,8 @@ * * */ -#ifndef __DSC_H__ -#define __DSC_H__ +#ifndef DSC_H_ +#define DSC_H_ #include "ctk/ctk.h" @@ -137,4 +137,4 @@ struct dsc { /** @} */ -#endif /* _DSC_H__ */ +#endif /*DSC_H__ */ diff --git a/core/sys/energest.h b/core/sys/energest.h index 70b46ab6c..6d43aaa11 100644 --- a/core/sys/energest.h +++ b/core/sys/energest.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __ENERGEST_H__ -#define __ENERGEST_H__ +#ifndef ENERGEST_H_ +#define ENERGEST_H_ #include "sys/rtimer.h" @@ -126,4 +126,4 @@ extern energest_t energest_leveldevice_current_leveltime[ENERGEST_CONF_LEVELDEVI #define ENERGEST_OFF_LEVEL(type,level) do { } while(0) #endif /* ENERGEST_CONF_ON */ -#endif /* __ENERGEST_H__ */ +#endif /* ENERGEST_H_ */ diff --git a/core/sys/etimer.h b/core/sys/etimer.h index f46e24c13..10452dc2a 100644 --- a/core/sys/etimer.h +++ b/core/sys/etimer.h @@ -59,8 +59,8 @@ * Author: Adam Dunkels * */ -#ifndef __ETIMER_H__ -#define __ETIMER_H__ +#ifndef ETIMER_H_ +#define ETIMER_H_ #include "sys/timer.h" #include "sys/process.h" @@ -236,6 +236,6 @@ clock_time_t etimer_next_expiration_time(void); /** @} */ PROCESS_NAME(etimer_process); -#endif /* __ETIMER_H__ */ +#endif /* ETIMER_H_ */ /** @} */ /** @} */ diff --git a/core/sys/lc-addrlabels.h b/core/sys/lc-addrlabels.h index b7f7028e4..fc86f92ce 100644 --- a/core/sys/lc-addrlabels.h +++ b/core/sys/lc-addrlabels.h @@ -56,8 +56,8 @@ * implementation. */ -#ifndef __LC_ADDRLABELS_H__ -#define __LC_ADDRLABELS_H__ +#ifndef LC_ADDRLABELS_H_ +#define LC_ADDRLABELS_H_ /** \hideinitializer */ typedef void * lc_t; @@ -77,5 +77,5 @@ typedef void * lc_t; #define LC_END(s) -#endif /* __LC_ADDRLABELS_H__ */ +#endif /* LC_ADDRLABELS_H_ */ /** @} */ diff --git a/core/sys/lc-switch.h b/core/sys/lc-switch.h index 6ffb6c763..8fcef3449 100644 --- a/core/sys/lc-switch.h +++ b/core/sys/lc-switch.h @@ -53,8 +53,8 @@ * http://www.chiark.greenend.org.uk/~sgtatham/coroutines.html */ -#ifndef __LC_SWITCH_H__ -#define __LC_SWITCH_H__ +#ifndef LC_SWITCH_H_ +#define LC_SWITCH_H_ /* WARNING! lc implementation using switch() does not work if an LC_SET() is done within another switch() statement! */ @@ -70,6 +70,6 @@ typedef unsigned short lc_t; #define LC_END(s) } -#endif /* __LC_SWITCH_H__ */ +#endif /* LC_SWITCH_H_ */ /** @} */ diff --git a/core/sys/lc.h b/core/sys/lc.h index 2da0e4a9e..3f57d879c 100644 --- a/core/sys/lc.h +++ b/core/sys/lc.h @@ -115,8 +115,8 @@ */ #endif /* DOXYGEN */ -#ifndef __LC_H__ -#define __LC_H__ +#ifndef LC_H_ +#define LC_H_ #ifdef LC_CONF_INCLUDE #include LC_CONF_INCLUDE @@ -124,7 +124,7 @@ #include "sys/lc-switch.h" #endif /* LC_CONF_INCLUDE */ -#endif /* __LC_H__ */ +#endif /* LC_H_ */ /** @} */ /** @} */ diff --git a/core/sys/loader.h b/core/sys/loader.h index 3b8656636..e54629aff 100644 --- a/core/sys/loader.h +++ b/core/sys/loader.h @@ -51,8 +51,8 @@ * * */ -#ifndef __LOADER_H__ -#define __LOADER_H__ +#ifndef LOADER_H_ +#define LOADER_H_ /* Errors that the LOADER_LOAD() function may return: */ @@ -125,7 +125,7 @@ #define LOADER_UNLOAD_DSC(dsc) #endif /* LOADER_UNLOAD */ -#endif /* __LOADER_H__ */ +#endif /* LOADER_H_ */ /** @} */ /** @} */ diff --git a/core/sys/log.h b/core/sys/log.h index 93aecb765..c6bc24737 100644 --- a/core/sys/log.h +++ b/core/sys/log.h @@ -31,8 +31,8 @@ * Author: Adam Dunkels * */ -#ifndef __LOG_H__ -#define __LOG_H__ +#ifndef LOG_H_ +#define LOG_H_ #include "contiki-conf.h" @@ -42,4 +42,4 @@ void log_message(const char *part1, const char *part2); #define log_message(p1, p2) #endif /* LOG_CONF_ENABLED */ -#endif /* __LOG_H__ */ +#endif /* LOG_H_ */ diff --git a/core/sys/mt.h b/core/sys/mt.h index 4d53fff4a..0e67dee0d 100644 --- a/core/sys/mt.h +++ b/core/sys/mt.h @@ -79,8 +79,8 @@ * Adam Dunkels * */ -#ifndef __MT_H__ -#define __MT_H__ +#ifndef MT_H_ +#define MT_H_ #include "contiki.h" @@ -267,4 +267,4 @@ void mt_stop(struct mt_thread *thread); /** @} */ /** @} */ -#endif /* __MT_H__ */ +#endif /* MT_H_ */ diff --git a/core/sys/node-id.h b/core/sys/node-id.h index f0435228a..0b6ebe6b1 100644 --- a/core/sys/node-id.h +++ b/core/sys/node-id.h @@ -32,12 +32,12 @@ * */ -#ifndef __NODE_ID_H__ -#define __NODE_ID_H__ +#ifndef NODE_ID_H_ +#define NODE_ID_H_ void node_id_restore(void); void node_id_burn(unsigned short node_id); extern unsigned short node_id; -#endif /* __NODE_ID_H__ */ +#endif /* NODE_ID_H_ */ diff --git a/core/sys/process.h b/core/sys/process.h index 63fa75e14..7063ee024 100644 --- a/core/sys/process.h +++ b/core/sys/process.h @@ -50,8 +50,8 @@ * Adam Dunkels * */ -#ifndef __PROCESS_H__ -#define __PROCESS_H__ +#ifndef PROCESS_H_ +#define PROCESS_H_ #include "sys/pt.h" #include "sys/cc.h" @@ -525,7 +525,7 @@ CCIF extern struct process *process_list; #define PROCESS_LIST() process_list -#endif /* __PROCESS_H__ */ +#endif /* PROCESS_H_ */ /** @} */ /** @} */ diff --git a/core/sys/procinit.h b/core/sys/procinit.h index 134b8d7d6..5e65a6de6 100644 --- a/core/sys/procinit.h +++ b/core/sys/procinit.h @@ -29,8 +29,8 @@ * This file is part of the Contiki operating system. * */ -#ifndef __PROCINIT_H__ -#define __PROCINIT_H__ +#ifndef PROCINIT_H_ +#define PROCINIT_H_ #include "sys/process.h" @@ -41,4 +41,4 @@ const struct process *procinit[] = {__VA_ARGS__, NULL} void procinit_init(void); -#endif /* __PROCINIT_H__ */ +#endif /* PROCINIT_H_ */ diff --git a/core/sys/pt-sem.h b/core/sys/pt-sem.h index 3f8a4f9e9..75d66452a 100644 --- a/core/sys/pt-sem.h +++ b/core/sys/pt-sem.h @@ -156,8 +156,8 @@ PT_THREAD(driver_thread(struct pt *pt)) * */ -#ifndef __PT_SEM_H__ -#define __PT_SEM_H__ +#ifndef PT_SEM_H_ +#define PT_SEM_H_ #include "sys/pt.h" @@ -220,7 +220,7 @@ struct pt_sem { */ #define PT_SEM_SIGNAL(pt, s) ++(s)->count -#endif /* __PT_SEM_H__ */ +#endif /* PT_SEM_H_ */ /** @} */ /** @} */ diff --git a/core/sys/pt.h b/core/sys/pt.h index 9433a1086..c9549119e 100644 --- a/core/sys/pt.h +++ b/core/sys/pt.h @@ -45,8 +45,8 @@ * */ -#ifndef __PT_H__ -#define __PT_H__ +#ifndef PT_H_ +#define PT_H_ #include "sys/lc.h" @@ -317,6 +317,6 @@ struct pt { /** @} */ -#endif /* __PT_H__ */ +#endif /* PT_H_ */ /** @} */ diff --git a/core/sys/rtimer.h b/core/sys/rtimer.h index 113dc7ded..7f393947d 100644 --- a/core/sys/rtimer.h +++ b/core/sys/rtimer.h @@ -49,8 +49,8 @@ * This file is part of the Contiki operating system. * */ -#ifndef __RTIMER_H__ -#define __RTIMER_H__ +#ifndef RTIMER_H_ +#define RTIMER_H_ #include "contiki-conf.h" @@ -150,7 +150,7 @@ void rtimer_arch_schedule(rtimer_clock_t t); #define RTIMER_SECOND RTIMER_ARCH_SECOND -#endif /* __RTIMER_H__ */ +#endif /* RTIMER_H_ */ /** @} */ /** @} */ diff --git a/core/sys/stimer.h b/core/sys/stimer.h index 16711e604..3615fc58c 100644 --- a/core/sys/stimer.h +++ b/core/sys/stimer.h @@ -65,8 +65,8 @@ * Author: Adam Dunkels , Nicolas Tsiftes * */ -#ifndef __STIMER_H__ -#define __STIMER_H__ +#ifndef STIMER_H_ +#define STIMER_H_ #include "sys/clock.h" @@ -91,7 +91,7 @@ unsigned long stimer_remaining(struct stimer *t); unsigned long stimer_elapsed(struct stimer *t); -#endif /* __STIMER_H__ */ +#endif /* STIMER_H_ */ /** @} */ /** @} */ diff --git a/core/sys/subprocess.h b/core/sys/subprocess.h index 9f2761810..d7b3760a4 100644 --- a/core/sys/subprocess.h +++ b/core/sys/subprocess.h @@ -49,8 +49,8 @@ * Adam Dunkels */ -#ifndef __SUBPROCESS_H__ -#define __SUBPROCESS_H__ +#ifndef SUBPROCESS_H_ +#define SUBPROCESS_H_ #define SUBPROCESS_BEGIN(strname) \ { \ @@ -66,4 +66,4 @@ } \ } -#endif /* __SUBPROCESS_H__ */ +#endif /* SUBPROCESS_H_ */ diff --git a/core/sys/timer.h b/core/sys/timer.h index 3bfdfa81f..06a25524c 100644 --- a/core/sys/timer.h +++ b/core/sys/timer.h @@ -70,8 +70,8 @@ * Author: Adam Dunkels * */ -#ifndef __TIMER_H__ -#define __TIMER_H__ +#ifndef TIMER_H_ +#define TIMER_H_ #include "sys/clock.h" @@ -95,7 +95,7 @@ CCIF int timer_expired(struct timer *t); clock_time_t timer_remaining(struct timer *t); -#endif /* __TIMER_H__ */ +#endif /* TIMER_H_ */ /** @} */ /** @} */ diff --git a/cpu/6502/6502def.h b/cpu/6502/6502def.h index e0adc70df..6ff6c2ad2 100644 --- a/cpu/6502/6502def.h +++ b/cpu/6502/6502def.h @@ -32,8 +32,8 @@ * */ -#ifndef __6502DEF_H__ -#define __6502DEF_H__ +#ifndef S502DEF_H_ +#define S502DEF_H_ #include #include @@ -160,4 +160,4 @@ typedef unsigned short uip_stats_t; #define cfs_remove remove #endif /* WITH_PFS */ -#endif /* __6502DEF_H__ */ +#endif /* S502DEF_H_ */ diff --git a/cpu/6502/lib/config.h b/cpu/6502/lib/config.h index 4abc9f22d..8f7f971be 100644 --- a/cpu/6502/lib/config.h +++ b/cpu/6502/lib/config.h @@ -32,9 +32,9 @@ * */ -#ifndef __CONFIG_H__ -#define __CONFIG_H__ +#ifndef CONFIG_H_ +#define CONFIG_H_ struct ethernet_config * CC_FASTCALL config_read(char *filename); -#endif /* __CONFIG_H__ */ +#endif /* CONFIG_H_ */ diff --git a/cpu/6502/lib/error.h b/cpu/6502/lib/error.h index 5f4ef04b7..7a11a4fbf 100644 --- a/cpu/6502/lib/error.h +++ b/cpu/6502/lib/error.h @@ -32,9 +32,9 @@ * */ -#ifndef __ERROR_H__ -#define __ERROR_H__ +#ifndef ERROR_H_ +#define ERROR_H_ void error_exit(void); -#endif /* __ERROR_H__ */ +#endif /* ERROR_H_ */ diff --git a/cpu/6502/lib/pfs.h b/cpu/6502/lib/pfs.h index a47e6d1d0..25c62e8bf 100644 --- a/cpu/6502/lib/pfs.h +++ b/cpu/6502/lib/pfs.h @@ -32,8 +32,8 @@ * */ -#ifndef __PFS_H__ -#define __PFS_H__ +#ifndef PFS_H_ +#define PFS_H_ int __fastcall__ pfs_open(const char* name, int flags); void __fastcall__ pfs_close(int fd); @@ -42,4 +42,4 @@ int __fastcall__ pfs_write(int fd, void* buf, unsigned int len); int __fastcall__ pfs_seek(int fd, int offset, int whence); int __fastcall__ pfs_remove(const char *name); -#endif /* __PFS_H__ */ +#endif /* PFS_H_ */ diff --git a/cpu/6502/lib/unload.h b/cpu/6502/lib/unload.h index 9dcfbda15..d70a7b706 100644 --- a/cpu/6502/lib/unload.h +++ b/cpu/6502/lib/unload.h @@ -32,11 +32,11 @@ * */ -#ifndef __UNLOAD_H__ -#define __UNLOAD_H__ +#ifndef UNLOAD_H_ +#define UNLOAD_H_ #define LOADER_UNLOAD unload void unload(void); -#endif /* __UNLOAD_H__ */ +#endif /* UNLOAD_H_ */ diff --git a/cpu/6502/net/ethernet-drv.h b/cpu/6502/net/ethernet-drv.h index abc5c8776..6a238a9dc 100644 --- a/cpu/6502/net/ethernet-drv.h +++ b/cpu/6502/net/ethernet-drv.h @@ -30,8 +30,8 @@ * */ -#ifndef __ETHERNET_DRV_H__ -#define __ETHERNET_DRV_H__ +#ifndef ETHERNET_DRV_H_ +#define ETHERNET_DRV_H_ #include "contiki.h" @@ -44,4 +44,4 @@ PROCESS_NAME(ethernet_process); uint8_t ethernet_output(void); -#endif /* __ETHERNET_DRV_H__ */ +#endif /* ETHERNET_DRV_H_ */ diff --git a/cpu/6502/net/ethernet.h b/cpu/6502/net/ethernet.h index 6d6e5f84d..d99f06451 100644 --- a/cpu/6502/net/ethernet.h +++ b/cpu/6502/net/ethernet.h @@ -32,12 +32,12 @@ * */ -#ifndef __ETHERNET_H__ -#define __ETHERNET_H__ +#ifndef ETHERNET_H_ +#define ETHERNET_H_ void CC_FASTCALL ethernet_init(struct ethernet_config *config); uint16_t ethernet_poll(void); void ethernet_send(void); void ethernet_exit(void); -#endif /* __ETHERNET_H__ */ +#endif /* ETHERNET_H_ */ diff --git a/cpu/6502/sys/lc.h b/cpu/6502/sys/lc.h index fc894b531..b0c3e1941 100644 --- a/cpu/6502/sys/lc.h +++ b/cpu/6502/sys/lc.h @@ -35,8 +35,8 @@ within a function. */ -#ifndef __LC_H__ -#define __LC_H__ +#ifndef LC_H_ +#define LC_H_ typedef void * lc_t; @@ -48,4 +48,4 @@ void __fastcall__ lc_resume(lc_t *lc); #define LC_INIT(lc) (lc) = NULL #define LC_END(lc) -#endif /* __LC_H__ */ +#endif /* LC_H_ */ diff --git a/cpu/6502/sys/mtarch.h b/cpu/6502/sys/mtarch.h index 8656a4eb7..4e3b90574 100644 --- a/cpu/6502/sys/mtarch.h +++ b/cpu/6502/sys/mtarch.h @@ -32,8 +32,8 @@ * */ -#ifndef __MTARCH_H__ -#define __MTARCH_H__ +#ifndef MTARCH_H_ +#define MTARCH_H_ #define MTARCH_CPUSTACKSIZE 256 #define MTARCH_CSTACKSIZE 256 @@ -46,4 +46,4 @@ struct mtarch_thread { unsigned char zp [MTARCH_ZPSIZE]; }; -#endif /* __MTARCH_H__ */ +#endif /* MTARCH_H_ */ diff --git a/cpu/6502/sys/rtimer-arch.h b/cpu/6502/sys/rtimer-arch.h index 03e1db418..351e6ad30 100644 --- a/cpu/6502/sys/rtimer-arch.h +++ b/cpu/6502/sys/rtimer-arch.h @@ -30,8 +30,8 @@ * */ -#ifndef __RTIMER_ARCH_H__ -#define __RTIMER_ARCH_H__ +#ifndef RTIMER_ARCH_H_ +#define RTIMER_ARCH_H_ #include "contiki-conf.h" @@ -39,4 +39,4 @@ #define rtimer_arch_now() clock_time() -#endif /* __RTIMER_ARCH_H__ */ +#endif /* RTIMER_ARCH_H_ */ diff --git a/cpu/arm/at91sam7s/debug-uart.h b/cpu/arm/at91sam7s/debug-uart.h index dba6b9962..c322de89e 100644 --- a/cpu/arm/at91sam7s/debug-uart.h +++ b/cpu/arm/at91sam7s/debug-uart.h @@ -1,5 +1,5 @@ -#ifndef __DEBUG_UART_H__1V2039076V__ -#define __DEBUG_UART_H__1V2039076V__ +#ifndef DEBUG_UART_H_1V2039076V__ +#define DEBUG_UART_H_1V2039076V__ void @@ -30,4 +30,4 @@ dbg_blocking_putchar(const char ch); void dbg_drain(); -#endif /* __DEBUG_UART_H__1V2039076V__ */ +#endif /* DEBUG_UART_H_1V2039076V__ */ diff --git a/cpu/arm/at91sam7s/io.h b/cpu/arm/at91sam7s/io.h index e6e9b6d9c..b08ff144b 100644 --- a/cpu/arm/at91sam7s/io.h +++ b/cpu/arm/at91sam7s/io.h @@ -1,5 +1,5 @@ -#ifndef __IO_H__7UTLUP9AG6__ -#define __IO_H__7UTLUP9AG6__ +#ifndef IO_H_7UTLUP9AG6__ +#define IO_H_7UTLUP9AG6__ #include @@ -12,4 +12,4 @@ int splhigh(void); void splx(int saved); -#endif /* __IO_H__7UTLUP9AG6__ */ +#endif /* IO_H_7UTLUP9AG6__ */ diff --git a/cpu/arm/at91sam7s/loader/codeprop-otf.h b/cpu/arm/at91sam7s/loader/codeprop-otf.h index 14965b734..e2ba71b06 100644 --- a/cpu/arm/at91sam7s/loader/codeprop-otf.h +++ b/cpu/arm/at91sam7s/loader/codeprop-otf.h @@ -29,8 +29,8 @@ * This file is part of the Contiki operating system. * */ -#ifndef __CODEPROP_H__ -#define __CODEPROP_H__ +#ifndef CODEPROP_H_ +#define CODEPROP_H_ #include "contiki.h" @@ -48,4 +48,4 @@ extern struct elfloader_output *codeprop_output; extern char *codeprop_filesystem; -#endif /* __CODEPROP_H__ */ +#endif /* CODEPROP_H_ */ diff --git a/cpu/arm/at91sam7s/loader/elfloader-arch-otf.h b/cpu/arm/at91sam7s/loader/elfloader-arch-otf.h index d44695099..9fe8a77ae 100644 --- a/cpu/arm/at91sam7s/loader/elfloader-arch-otf.h +++ b/cpu/arm/at91sam7s/loader/elfloader-arch-otf.h @@ -63,8 +63,8 @@ * */ -#ifndef __ELFLOADER_ARCH_H__ -#define __ELFLOADER_ARCH_H__ +#ifndef ELFLOADER_ARCH_H_ +#define ELFLOADER_ARCH_H_ #include "elfloader-otf.h" @@ -94,7 +94,7 @@ int elfloader_arch_relocate(int input_fd, char *sectionaddr, struct elf32_rela *rela, char *addr); -#endif /* __ELFLOADER_ARCH_H__ */ +#endif /* ELFLOADER_ARCH_H_ */ /** @} */ /** @} */ diff --git a/cpu/arm/at91sam7s/loader/elfloader-otf.h b/cpu/arm/at91sam7s/loader/elfloader-otf.h index 91dc94b9b..d3c06c091 100644 --- a/cpu/arm/at91sam7s/loader/elfloader-otf.h +++ b/cpu/arm/at91sam7s/loader/elfloader-otf.h @@ -74,8 +74,8 @@ * */ -#ifndef __ELFLOADER_H__ -#define __ELFLOADER_H__ +#ifndef ELFLOADER_H_ +#define ELFLOADER_H_ #include "cfs/cfs.h" @@ -308,7 +308,7 @@ struct elf32_rela { }; -#endif /* __ELFLOADER_H__ */ +#endif /* ELFLOADER_H_ */ /** @} */ /** @} */ diff --git a/cpu/arm/at91sam7s/loader/ram-segments.h b/cpu/arm/at91sam7s/loader/ram-segments.h index 6f3936dfa..e5aa3c93f 100644 --- a/cpu/arm/at91sam7s/loader/ram-segments.h +++ b/cpu/arm/at91sam7s/loader/ram-segments.h @@ -1,6 +1,6 @@ -#ifndef __RAM_SEGMENTS_H__8EDB9N09UD__ -#define __RAM_SEGMENTS_H__8EDB9N09UD__ +#ifndef RAM_SEGMENTS_H_8EDB9N09UD__ +#define RAM_SEGMENTS_H_8EDB9N09UD__ PROCESS_NAME(ram_segments_cleanup_process); -#endif /* __RAM_SEGMENTS_H__8EDB9N09UD__ */ +#endif /* RAM_SEGMENTS_H_8EDB9N09UD__ */ diff --git a/cpu/arm/at91sam7s/rtimer-arch-interrupt.h b/cpu/arm/at91sam7s/rtimer-arch-interrupt.h index 1ba91aed7..97ea3671d 100644 --- a/cpu/arm/at91sam7s/rtimer-arch-interrupt.h +++ b/cpu/arm/at91sam7s/rtimer-arch-interrupt.h @@ -1,6 +1,6 @@ -#ifndef __RTIMER_ARCH_INTERRUPT_H__P0PXG70757__ -#define __RTIMER_ARCH_INTERRUPT_H__P0PXG70757__ +#ifndef RTIMER_ARCH_INTERRUPT_H_P0PXG70757__ +#define RTIMER_ARCH_INTERRUPT_H_P0PXG70757__ void rtimer_interrupt (void); -#endif /* __RTIMER_ARCH_INTERRUPT_H__P0PXG70757__ */ +#endif /* RTIMER_ARCH_INTERRUPT_H_P0PXG70757__ */ diff --git a/cpu/arm/at91sam7s/rtimer-arch.h b/cpu/arm/at91sam7s/rtimer-arch.h index e096a3a89..bacf656e7 100644 --- a/cpu/arm/at91sam7s/rtimer-arch.h +++ b/cpu/arm/at91sam7s/rtimer-arch.h @@ -5,8 +5,8 @@ * Simon Berg */ -#ifndef __RTIMER_ARCH_H__ -#define __RTIMER_ARCH_H__ +#ifndef RTIMER_ARCH_H_ +#define RTIMER_ARCH_H_ #include "sys/rtimer.h" @@ -19,4 +19,4 @@ void rtimer_arch_set(rtimer_clock_t t); rtimer_clock_t rtimer_arch_now(void); -#endif /* __RTIMER_ARCH_H__ */ +#endif /* RTIMER_ARCH_H_ */ diff --git a/cpu/arm/at91sam7s/sys-interrupt.h b/cpu/arm/at91sam7s/sys-interrupt.h index 433db4a0f..738d336b1 100644 --- a/cpu/arm/at91sam7s/sys-interrupt.h +++ b/cpu/arm/at91sam7s/sys-interrupt.h @@ -1,5 +1,5 @@ -#ifndef __SYS_INTERRUPT_H__QIHZ66NP8K__ -#define __SYS_INTERRUPT_H__QIHZ66NP8K__ +#ifndef SYS_INTERRUPT_H_QIHZ66NP8K__ +#define SYS_INTERRUPT_H_QIHZ66NP8K__ /* Returns true if it handled an activbe interrupt */ @@ -28,4 +28,4 @@ sys_interrupt_prepend_handler(SystemInterruptHandler *handler); void sys_interrupt_remove_handler(SystemInterruptHandler *handler); -#endif /* __SYS_INTERRUPT_H__QIHZ66NP8K__ */ +#endif /* SYS_INTERRUPT_H_QIHZ66NP8K__ */ diff --git a/cpu/arm/at91sam7s/usb-interrupt.h b/cpu/arm/at91sam7s/usb-interrupt.h index aad1c434e..c805de01e 100644 --- a/cpu/arm/at91sam7s/usb-interrupt.h +++ b/cpu/arm/at91sam7s/usb-interrupt.h @@ -1,5 +1,5 @@ -#ifndef __USB_INTERRUPT_H__0HRIPZ5SIA__ -#define __USB_INTERRUPT_H__0HRIPZ5SIA__ +#ifndef USB_INTERRUPT_H_0HRIPZ5SIA__ +#define USB_INTERRUPT_H_0HRIPZ5SIA__ void usb_int (void); @@ -18,4 +18,4 @@ usb_arch_suspend_int(); void usb_arch_resume_int(); -#endif /* __USB_INTERRUPT_H__0HRIPZ5SIA__ */ +#endif /* USB_INTERRUPT_H_0HRIPZ5SIA__ */ diff --git a/cpu/arm/common/SD-card/config.h b/cpu/arm/common/SD-card/config.h index 0e09e88fe..d942669ce 100644 --- a/cpu/arm/common/SD-card/config.h +++ b/cpu/arm/common/SD-card/config.h @@ -1,5 +1,5 @@ -#ifndef __EFSL_CONFIG_H__ -#define __EFSL_CONFIG_H__ +#ifndef EFSL_CONFIG_H_ +#define EFSL_CONFIG_H_ /* Close enough */ #define HW_ENDPOINT_LPC2000_SD diff --git a/cpu/arm/common/SD-card/efs-sdcard.h b/cpu/arm/common/SD-card/efs-sdcard.h index ffc4968ba..d4659abf0 100644 --- a/cpu/arm/common/SD-card/efs-sdcard.h +++ b/cpu/arm/common/SD-card/efs-sdcard.h @@ -1,5 +1,5 @@ -#ifndef __SDCARD_H__KJBBKS6O57__ -#define __SDCARD_H__KJBBKS6O57__ +#ifndef SDCARD_H_KJBBKS6O57__ +#define SDCARD_H_KJBBKS6O57__ #include #include @@ -24,4 +24,4 @@ extern process_event_t sdcard_removed_event; void sdcard_event_process(struct process *p); -#endif /* __SDCARD_H__KJBBKS6O57__ */ +#endif /* SDCARD_H_KJBBKS6O57__ */ diff --git a/cpu/arm/common/SD-card/efsl_spi.h b/cpu/arm/common/SD-card/efsl_spi.h index 6989c81aa..f51b088ca 100644 --- a/cpu/arm/common/SD-card/efsl_spi.h +++ b/cpu/arm/common/SD-card/efsl_spi.h @@ -1,5 +1,5 @@ -#ifndef __EFSL_SPI_H__6B6MX40N68__ -#define __EFSL_SPI_H__6B6MX40N68__ +#ifndef EFSL_SPI_H_6B6MX40N68__ +#define EFSL_SPI_H_6B6MX40N68__ #include @@ -18,4 +18,4 @@ void if_spiSetSpeed(euint8 speed); euint8 if_spiSend(hwInterface *iface, euint8 outgoing); -#endif /* __EFSL_SPI_H__6B6MX40N68__ */ +#endif /* EFSL_SPI_H_6B6MX40N68__ */ diff --git a/cpu/arm/common/SD-card/sdcard.h b/cpu/arm/common/SD-card/sdcard.h index fcca1461d..1f8a88bde 100644 --- a/cpu/arm/common/SD-card/sdcard.h +++ b/cpu/arm/common/SD-card/sdcard.h @@ -1,5 +1,5 @@ -#ifndef __SDCARD_H__KJBBKS6O57__ -#define __SDCARD_H__KJBBKS6O57__ +#ifndef SDCARD_H_KJBBKS6O57__ +#define SDCARD_H_KJBBKS6O57__ #include @@ -19,4 +19,4 @@ extern process_event_t sdcard_removed_event; void sdcard_event_process(struct process *p); -#endif /* __SDCARD_H__KJBBKS6O57__ */ +#endif /* SDCARD_H_KJBBKS6O57__ */ diff --git a/cpu/arm/common/dbg-io/strformat.h b/cpu/arm/common/dbg-io/strformat.h index d953c3e1e..c32eed670 100644 --- a/cpu/arm/common/dbg-io/strformat.h +++ b/cpu/arm/common/dbg-io/strformat.h @@ -1,5 +1,5 @@ -#ifndef __STRFORMAT_H__ -#define __STRFORMAT_H__ +#ifndef STRFORMAT_H_ +#define STRFORMAT_H_ #include @@ -22,4 +22,4 @@ int format_str(const StrFormatContext *ctxt, const char *format, ...) int format_str_v(const StrFormatContext *ctxt, const char *format, va_list ap); -#endif /* __STRFORMAT_H__ */ +#endif /* STRFORMAT_H_ */ diff --git a/cpu/arm/common/usb/cdc-acm/cdc-acm.h b/cpu/arm/common/usb/cdc-acm/cdc-acm.h index 4a85dc208..f4bb9b388 100644 --- a/cpu/arm/common/usb/cdc-acm/cdc-acm.h +++ b/cpu/arm/common/usb/cdc-acm/cdc-acm.h @@ -1,7 +1,7 @@ -#ifndef __CDC_ACM_H__UFV6K50827__ -#define __CDC_ACM_H__UFV6K50827__ +#ifndef CDC_ACM_H_UFV6K50827__ +#define CDC_ACM_H_UFV6K50827__ void usb_cdc_acm_setup(); -#endif /* __CDC_ACM_H__UFV6K50827__ */ +#endif /* CDC_ACM_H_UFV6K50827__ */ diff --git a/cpu/arm/common/usb/cdc-acm/cdc.h b/cpu/arm/common/usb/cdc-acm/cdc.h index 2d57abc2b..7636dfdcc 100644 --- a/cpu/arm/common/usb/cdc-acm/cdc.h +++ b/cpu/arm/common/usb/cdc-acm/cdc.h @@ -1,5 +1,5 @@ -#ifndef __CDC_H__K1Q26ESJOC__ -#define __CDC_H__K1Q26ESJOC__ +#ifndef CDC_H_K1Q26ESJOC__ +#define CDC_H_K1Q26ESJOC__ #include /* Communication Class */ /* Class code */ @@ -211,4 +211,4 @@ struct usb_cdc_line_coding Uchar bDataBits; } BYTE_ALIGNED; -#endif /* __CDC_H__K1Q26ESJOC__ */ +#endif /* CDC_H_K1Q26ESJOC__ */ diff --git a/cpu/arm/common/usb/cdc-eth/cdc-eth.h b/cpu/arm/common/usb/cdc-eth/cdc-eth.h index bfdb4202a..3e8cfb458 100644 --- a/cpu/arm/common/usb/cdc-eth/cdc-eth.h +++ b/cpu/arm/common/usb/cdc-eth/cdc-eth.h @@ -1,5 +1,5 @@ -#ifndef __CDC_ETH_H__NUI0ULFC7C__ -#define __CDC_ETH_H__NUI0ULFC7C__ +#ifndef CDC_ETH_H_NUI0ULFC7C__ +#define CDC_ETH_H_NUI0ULFC7C__ #include @@ -10,4 +10,4 @@ usb_cdc_eth_set_ifaddr(uip_ipaddr_t *addr); void usb_cdc_eth_setup(); -#endif /* __CDC_ETH_H__NUI0ULFC7C__ */ +#endif /* CDC_ETH_H_NUI0ULFC7C__ */ diff --git a/cpu/arm/common/usb/cdc-eth/dhcps.h b/cpu/arm/common/usb/cdc-eth/dhcps.h index d8de26d3a..a893b4459 100644 --- a/cpu/arm/common/usb/cdc-eth/dhcps.h +++ b/cpu/arm/common/usb/cdc-eth/dhcps.h @@ -1,5 +1,5 @@ -#ifndef __DHCPS_H__6M2XYUGNTK__ -#define __DHCPS_H__6M2XYUGNTK__ +#ifndef DHCPS_H_6M2XYUGNTK__ +#define DHCPS_H_6M2XYUGNTK__ #include "contiki-net.h" #include @@ -44,4 +44,4 @@ struct dhcps_config **/ void dhcps_init(const struct dhcps_config *conf); -#endif /* __DHCPS_H__6M2XYUGNTK__ */ +#endif /* DHCPS_H_6M2XYUGNTK__ */ diff --git a/cpu/arm/common/usb/descriptors.h b/cpu/arm/common/usb/descriptors.h index 30808f744..f54184395 100644 --- a/cpu/arm/common/usb/descriptors.h +++ b/cpu/arm/common/usb/descriptors.h @@ -1,5 +1,5 @@ -#ifndef __DESCRIPTORS_H__RPFUB8O7OV__ -#define __DESCRIPTORS_H__RPFUB8O7OV__ +#ifndef DESCRIPTORS_H_RPFUB8O7OV__ +#define DESCRIPTORS_H_RPFUB8O7OV__ #ifndef STRUCTGEN #include "usb.h" @@ -7,4 +7,4 @@ extern const struct usb_st_device_descriptor device_descriptor; extern const struct usb_st_configuration_descriptor const *configuration_head; -#endif /* __DESCRIPTORS_H__RPFUB8O7OV__ */ +#endif /* DESCRIPTORS_H_RPFUB8O7OV__ */ diff --git a/cpu/arm/common/usb/msc/rbc_const.h b/cpu/arm/common/usb/msc/rbc_const.h index 08f69b50f..3e9afb99a 100644 --- a/cpu/arm/common/usb/msc/rbc_const.h +++ b/cpu/arm/common/usb/msc/rbc_const.h @@ -1,5 +1,5 @@ -#ifndef __RBC_CONST_H__7YXZF39S33__ -#define __RBC_CONST_H__7YXZF39S33__ +#ifndef RBC_CONST_H_7YXZF39S33__ +#define RBC_CONST_H_7YXZF39S33__ #include @@ -63,4 +63,4 @@ #define SCSI_WRITE_FUA 0x08 -#endif /* __RBC_CONST_H__7YXZF39S33__ */ +#endif /* RBC_CONST_H_7YXZF39S33__ */ diff --git a/cpu/arm/common/usb/msc/rbc_struct.h b/cpu/arm/common/usb/msc/rbc_struct.h index fdf0334f0..73c296fc9 100644 --- a/cpu/arm/common/usb/msc/rbc_struct.h +++ b/cpu/arm/common/usb/msc/rbc_struct.h @@ -1,5 +1,5 @@ -#ifndef __RBC_STRUCT_H__10L0HKARRV__ -#define __RBC_STRUCT_H__10L0HKARRV__ +#ifndef RBC_STRUCT_H_10L0HKARRV__ +#define RBC_STRUCT_H_10L0HKARRV__ #include @@ -55,4 +55,4 @@ struct rbc_write_cmd } CC_BYTE_ALIGNED; -#endif /* __RBC_STRUCT_H__10L0HKARRV__ */ +#endif /* RBC_STRUCT_H_10L0HKARRV__ */ diff --git a/cpu/arm/common/usb/msc/scsi_command.h b/cpu/arm/common/usb/msc/scsi_command.h index b8d84e5cd..c475c3f63 100644 --- a/cpu/arm/common/usb/msc/scsi_command.h +++ b/cpu/arm/common/usb/msc/scsi_command.h @@ -1,5 +1,5 @@ -#ifndef __SCSI_COMMAND_H__SR3ALQCZSH__ -#define __SCSI_COMMAND_H__SR3ALQCZSH__ +#ifndef SCSI_COMMAND_H_SR3ALQCZSH__ +#define SCSI_COMMAND_H_SR3ALQCZSH__ #define SCSI_CMD_CHANGE_DEFINITION 0x40 #define SCSI_CMD_COMPARE 0x39 @@ -67,4 +67,4 @@ -#endif /* __SCSI_COMMAND_H__SR3ALQCZSH__ */ +#endif /* SCSI_COMMAND_H_SR3ALQCZSH__ */ diff --git a/cpu/arm/common/usb/msc/spc2_struct.h b/cpu/arm/common/usb/msc/spc2_struct.h index d09a54715..dcd51bb0a 100644 --- a/cpu/arm/common/usb/msc/spc2_struct.h +++ b/cpu/arm/common/usb/msc/spc2_struct.h @@ -1,5 +1,5 @@ -#ifndef __SPC2_STRUCT_H__6R1KTJP0NJ__ -#define __SPC2_STRUCT_H__6R1KTJP0NJ__ +#ifndef SPC2_STRUCT_H_6R1KTJP0NJ__ +#define SPC2_STRUCT_H_6R1KTJP0NJ__ typedef uint8_t uint40_bytes[5]; typedef uint8_t uint32_bytes[4]; @@ -136,4 +136,4 @@ struct spc2_mode_page uint8_t page_length; } CC_BYTE_ALIGNED; -#endif /* __SPC2_STRUCT_H__6R1KTJP0NJ__ */ +#endif /* SPC2_STRUCT_H_6R1KTJP0NJ__ */ diff --git a/cpu/arm/common/usb/msc/usb-msc-bulk.h b/cpu/arm/common/usb/msc/usb-msc-bulk.h index 68f05c654..6ac8e7372 100644 --- a/cpu/arm/common/usb/msc/usb-msc-bulk.h +++ b/cpu/arm/common/usb/msc/usb-msc-bulk.h @@ -1,5 +1,5 @@ -#ifndef __USB_MSC_BULK_H__SHSP6ONHDJ__ -#define __USB_MSC_BULK_H__SHSP6ONHDJ__ +#ifndef USB_MSC_BULK_H_SHSP6ONHDJ__ +#define USB_MSC_BULK_H_SHSP6ONHDJ__ #include #include @@ -100,4 +100,4 @@ usb_msc_receive_data_buf_flags(uint8_t *data, unsigned int len, -#endif /* __USB_MSC_BULK_H__SHSP6ONHDJ__ */ +#endif /* USB_MSC_BULK_H_SHSP6ONHDJ__ */ diff --git a/cpu/arm/common/usb/usb-api.h b/cpu/arm/common/usb/usb-api.h index 9286879f9..9ad3563e8 100644 --- a/cpu/arm/common/usb/usb-api.h +++ b/cpu/arm/common/usb/usb-api.h @@ -1,5 +1,5 @@ -#ifndef __USB_API_H__SYN81IFYBN__ -#define __USB_API_H__SYN81IFYBN__ +#ifndef USB_API_H_SYN81IFYBN__ +#define USB_API_H_SYN81IFYBN__ #include @@ -142,4 +142,4 @@ usb_get_ep_events(uint8_t addr); unsigned int usb_get_current_configuration(void); -#endif /* __USB_API_H__SYN81IFYBN__ */ +#endif /* USB_API_H_SYN81IFYBN__ */ diff --git a/cpu/arm/common/usb/usb-arch.h b/cpu/arm/common/usb/usb-arch.h index d0969c004..61fe5ca35 100644 --- a/cpu/arm/common/usb/usb-arch.h +++ b/cpu/arm/common/usb/usb-arch.h @@ -1,5 +1,5 @@ -#ifndef __USB_ARCH_H__0Z52ZDP0H6__ -#define __USB_ARCH_H__0Z52ZDP0H6__ +#ifndef USB_ARCH_H_0Z52ZDP0H6__ +#define USB_ARCH_H_0Z52ZDP0H6__ #include #include @@ -89,4 +89,4 @@ usb_arch_get_global_events(void); int usb_arch_send_pending(uint8_t ep_addr); -#endif /* __USB_ARCH_H__0Z52ZDP0H6__ */ +#endif /* USB_ARCH_H_0Z52ZDP0H6__ */ diff --git a/cpu/arm/common/usb/usb-core.h b/cpu/arm/common/usb/usb-core.h index 9baf5ab0e..d35b064dd 100644 --- a/cpu/arm/common/usb/usb-core.h +++ b/cpu/arm/common/usb/usb-core.h @@ -1,5 +1,5 @@ -#ifndef __USB_CORE_H__YIKJDA7S1X__ -#define __USB_CORE_H__YIKJDA7S1X__ +#ifndef USB_CORE_H_YIKJDA7S1X__ +#define USB_CORE_H_YIKJDA7S1X__ #include @@ -20,4 +20,4 @@ void usb_get_ctrl_data(uint8_t *data, unsigned int length, usb_ctrl_data_callback cb); -#endif /* __USB_CORE_H__YIKJDA7S1X__ */ +#endif /* USB_CORE_H_YIKJDA7S1X__ */ diff --git a/cpu/arm/common/usb/usb.h b/cpu/arm/common/usb/usb.h index 86dc3419a..a1d7dfb78 100644 --- a/cpu/arm/common/usb/usb.h +++ b/cpu/arm/common/usb/usb.h @@ -1,5 +1,5 @@ -#ifndef __USB_H__6PFTDPIMZM__ -#define __USB_H__6PFTDPIMZM__ +#ifndef USB_H_6PFTDPIMZM__ +#define USB_H_6PFTDPIMZM__ #include /* Adapted from usb_kbd_enum.h in c5131-usb-kbd-light-1_0_2 package from @@ -182,4 +182,4 @@ struct usb_st_language_descriptor Uint16 wlangid[1]; /* language id */ } BYTE_ALIGNED; -#endif /* __USB_H__6PFTDPIMZM__ */ +#endif /* USB_H_6PFTDPIMZM__ */ diff --git a/cpu/arm/stm32f103/debug-uart.h b/cpu/arm/stm32f103/debug-uart.h index 628e99e8f..0bd1d4f42 100644 --- a/cpu/arm/stm32f103/debug-uart.h +++ b/cpu/arm/stm32f103/debug-uart.h @@ -1,5 +1,5 @@ -#ifndef __DEBUG_UART_H__1V2039076V__ -#define __DEBUG_UART_H__1V2039076V__ +#ifndef DEBUG_UART_H_1V2039076V__ +#define DEBUG_UART_H_1V2039076V__ #ifndef dbg_setup_uart #define dbg_setup_uart dbg_setup_uart_default @@ -24,4 +24,4 @@ dbg_blocking_putchar(const char ch); void dbg_drain(); -#endif /* __DEBUG_UART_H__1V2039076V__ */ +#endif /* DEBUG_UART_H_1V2039076V__ */ diff --git a/cpu/arm/stm32f103/gpio.h b/cpu/arm/stm32f103/gpio.h index 3469e8015..5e0bed6c7 100644 --- a/cpu/arm/stm32f103/gpio.h +++ b/cpu/arm/stm32f103/gpio.h @@ -1,5 +1,5 @@ -#ifndef __GPIO_H__LK7NAD1HN8__ -#define __GPIO_H__LK7NAD1HN8__ +#ifndef GPIO_H_LK7NAD1HN8__ +#define GPIO_H_LK7NAD1HN8__ #include #define _GPIO_INPUT_ANALOG(h,l) 0 @@ -126,4 +126,4 @@ MODIFY_REG(AFIO->MAPR, AFIO_MAPR_SWJ_CFG | mask, AFIO_MAPR_SWJ_CFG_VALUE | value -#endif /* __GPIO_H__LK7NAD1HN8__ */ +#endif /* GPIO_H_LK7NAD1HN8__ */ diff --git a/cpu/arm/stm32f103/nvic.h b/cpu/arm/stm32f103/nvic.h index cb32440e5..153292d18 100644 --- a/cpu/arm/stm32f103/nvic.h +++ b/cpu/arm/stm32f103/nvic.h @@ -1,5 +1,5 @@ -#ifndef __NVIC_H__LE94F5JS4D__ -#define __NVIC_H__LE94F5JS4D__ +#ifndef NVIC_H_LE94F5JS4D__ +#define NVIC_H_LE94F5JS4D__ #include #include @@ -13,4 +13,4 @@ MODIFY_REG(NVIC->IPR[(i)/4], 0xf<<(((i)&3)*8), (p)<<(((i)&3)*8)) #define NVIC_SET_SYSTICK_PRI(p) MODIFY_REG(SCB->SHPR[2], 0xf<<24, (p)<<24) -#endif /* __NVIC_H__LE94F5JS4D__ */ +#endif /* NVIC_H_LE94F5JS4D__ */ diff --git a/cpu/arm/stm32f103/rtimer-arch.h b/cpu/arm/stm32f103/rtimer-arch.h index cbd95b4e2..7b3d348ad 100644 --- a/cpu/arm/stm32f103/rtimer-arch.h +++ b/cpu/arm/stm32f103/rtimer-arch.h @@ -5,8 +5,8 @@ * Simon Berg */ -#ifndef __RTIMER_ARCH_H__ -#define __RTIMER_ARCH_H__ +#ifndef RTIMER_ARCH_H_ +#define RTIMER_ARCH_H_ #include "sys/rtimer.h" @@ -16,4 +16,4 @@ void rtimer_arch_set(rtimer_clock_t t); rtimer_clock_t rtimer_arch_now(void); -#endif /* __RTIMER_ARCH_H__ */ +#endif /* RTIMER_ARCH_H_ */ diff --git a/cpu/avr/bootloader.h b/cpu/avr/bootloader.h index 1765f5634..e84e48240 100644 --- a/cpu/avr/bootloader.h +++ b/cpu/avr/bootloader.h @@ -1,5 +1,5 @@ -#ifndef __AVR_BOOTLOADER_H__ -#define __AVR_BOOTLOADER_H__ +#ifndef AVR_BOOTLOADER_H_ +#define AVR_BOOTLOADER_H_ #include #include diff --git a/cpu/avr/dev/compiler.h b/cpu/avr/dev/compiler.h index 5625752e8..48d6194ed 100644 --- a/cpu/avr/dev/compiler.h +++ b/cpu/avr/dev/compiler.h @@ -1,5 +1,5 @@ -#ifndef __COMPILER_H__ -#define __COMPILER_H__ +#ifndef COMPILER_H_ +#define COMPILER_H_ #ifdef __IMAGECRAFT__ @@ -36,4 +36,4 @@ -#endif /* __COMPILER_H__ */ +#endif /* COMPILER_H_ */ diff --git a/cpu/avr/dev/debug.h b/cpu/avr/dev/debug.h index ec38942b1..2a190dad6 100644 --- a/cpu/avr/dev/debug.h +++ b/cpu/avr/dev/debug.h @@ -1,5 +1,5 @@ -#ifndef __DEBUG_H__ -#define __DEBUG_H__ +#ifndef DEBUG_H_ +#define DEBUG_H_ #if 0 #define debug_print(x) @@ -17,4 +17,4 @@ void debug_print16(unsigned short v); -#endif /* __DEBUG_H__ */ +#endif /* DEBUG_H_ */ diff --git a/cpu/avr/dev/flash.h b/cpu/avr/dev/flash.h index 9e084d250..279c11bd2 100644 --- a/cpu/avr/dev/flash.h +++ b/cpu/avr/dev/flash.h @@ -1,8 +1,8 @@ -#ifndef __FLASH_H__ -#define __FLASH_H__ +#ifndef FLASH_H_ +#define FLASH_H_ #include void flash_write_page(uint32_t page, uint8_t *buf); -#endif /* __FLASH_H__ */ +#endif /* FLASH_H_ */ diff --git a/cpu/avr/dev/rs232.h b/cpu/avr/dev/rs232.h index c1b1de415..08a3d4f9f 100644 --- a/cpu/avr/dev/rs232.h +++ b/cpu/avr/dev/rs232.h @@ -33,8 +33,8 @@ * */ -#ifndef __RS232_H__ -#define __RS232_H__ +#ifndef RS232_H_ +#define RS232_H_ #include #include "contiki-conf.h" @@ -155,4 +155,4 @@ rs232_send(uint8_t port, unsigned char c); void rs232_redirect_stdout (uint8_t port); -#endif /* __RS232_H__ */ +#endif /* RS232_H_ */ diff --git a/cpu/avr/dev/usb/compiler.h b/cpu/avr/dev/usb/compiler.h index e60828eb3..aaa9f1ede 100644 --- a/cpu/avr/dev/usb/compiler.h +++ b/cpu/avr/dev/usb/compiler.h @@ -44,8 +44,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -#ifndef _COMPILER_H_ -#define _COMPILER_H_ +#ifndef COMPILER_H_ +#define COMPILER_H_ /*_____ I N C L U D E S ____________________________________________________*/ @@ -347,5 +347,5 @@ typedef char r_uart_ptchar; #define Disable_interrupt() cli() #endif -#endif /* _COMPILER_H_ */ +#endif /*COMPILER_H_ */ diff --git a/cpu/avr/dev/usb/conf_usb.h b/cpu/avr/dev/usb/conf_usb.h index d98930a4d..913d3aae6 100644 --- a/cpu/avr/dev/usb/conf_usb.h +++ b/cpu/avr/dev/usb/conf_usb.h @@ -40,8 +40,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _CONF_USB_H_ -#define _CONF_USB_H_ +#ifndef CONF_USB_H_ +#define CONF_USB_H_ @@ -153,4 +153,4 @@ extern void suspend_action(void); /** @} */ -#endif // _CONF_USB_H_ +#endif //CONF_USB_H_ diff --git a/cpu/avr/dev/usb/config.h b/cpu/avr/dev/usb/config.h index 2848208b0..aa6d81ba4 100644 --- a/cpu/avr/dev/usb/config.h +++ b/cpu/avr/dev/usb/config.h @@ -49,8 +49,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _CONFIG_H_ -#define _CONFIG_H_ +#ifndef CONFIG_H_ +#define CONFIG_H_ /** @addtogroup usb @@ -109,5 +109,5 @@ /** @} */ -#endif // _CONFIG_H_ +#endif //CONFIG_H_ diff --git a/cpu/avr/dev/usb/rndis/cdc_ecm.h b/cpu/avr/dev/usb/rndis/cdc_ecm.h index 2f620f7ae..d61276504 100644 --- a/cpu/avr/dev/usb/rndis/cdc_ecm.h +++ b/cpu/avr/dev/usb/rndis/cdc_ecm.h @@ -1,6 +1,6 @@ -#ifndef __CDC_ECM_H__ -#define __CDC_ECM_H__ +#ifndef CDC_ECM_H_ +#define CDC_ECM_H_ #include "contiki.h" #include @@ -15,4 +15,4 @@ extern void cdc_ecm_set_ethernet_packet_filter(void); extern void cdc_ecm_configure_endpoints(); extern void cdc_ecm_set_active(uint8_t value); -#endif // __CDC_ECM_H__ \ No newline at end of file +#endif // CDC_ECM_H_ \ No newline at end of file diff --git a/cpu/avr/dev/usb/rndis/cdc_eem.h b/cpu/avr/dev/usb/rndis/cdc_eem.h index 1f7c8ae49..81ee8b9bf 100644 --- a/cpu/avr/dev/usb/rndis/cdc_eem.h +++ b/cpu/avr/dev/usb/rndis/cdc_eem.h @@ -1,6 +1,6 @@ -#ifndef __CDC_EEM_H__ -#define __CDC_EEM_H__ +#ifndef CDC_EEM_H_ +#define CDC_EEM_H_ #include "contiki.h" #include @@ -9,4 +9,4 @@ extern void cdc_eem_process(void); extern uint8_t eem_send(uint8_t * senddata, uint16_t sendlen, uint8_t led); extern void cdc_eem_configure_endpoints(); -#endif // __CDC_EEM_H__ +#endif // CDC_EEM_H_ diff --git a/cpu/avr/dev/usb/rndis/rndis_task.h b/cpu/avr/dev/usb/rndis/rndis_task.h index a39b3651a..28148f1da 100644 --- a/cpu/avr/dev/usb/rndis/rndis_task.h +++ b/cpu/avr/dev/usb/rndis/rndis_task.h @@ -40,8 +40,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _RNDIS_TASK_H_ -#define _RNDIS_TASK_H_ +#ifndef RNDIS_TASK_H_ +#define RNDIS_TASK_H_ /** \addtogroup RNDIS @@ -121,5 +121,5 @@ PROCESS_NAME(usb_eth_process); /** @} */ -#endif /* _RNDIS_TASK_H_ */ +#endif /*RNDIS_TASK_H_ */ diff --git a/cpu/avr/dev/usb/serial/uart_usb_lib.h b/cpu/avr/dev/usb/serial/uart_usb_lib.h index 9d12e604c..f99a509fe 100644 --- a/cpu/avr/dev/usb/serial/uart_usb_lib.h +++ b/cpu/avr/dev/usb/serial/uart_usb_lib.h @@ -40,8 +40,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _UART_USB_LIB_H_ -#define _UART_USB_LIB_H_ +#ifndef UART_USB_LIB_H_ +#define UART_USB_LIB_H_ /** \addtogroup cdctask @@ -85,6 +85,6 @@ extern void uart_usb_configure_endpoints(); /** @} **/ -#endif /* _UART_USB_LIB_H_ */ +#endif /*UART_USB_LIB_H_ */ diff --git a/cpu/avr/dev/usb/storage/avr_flash.h b/cpu/avr/dev/usb/storage/avr_flash.h index a9a6474a6..7ab4015ad 100644 --- a/cpu/avr/dev/usb/storage/avr_flash.h +++ b/cpu/avr/dev/usb/storage/avr_flash.h @@ -44,8 +44,8 @@ @{ */ -#ifndef _DFMEM_H_ -#define _DFMEM_H_ +#ifndef DFMEM_H_ +#define DFMEM_H_ #include "conf_access.h" #include "ctrl_status.h" @@ -132,6 +132,6 @@ Ctrl_status avrf_usb_write( void ); -#endif // _DFMEM_H_ +#endif //DFMEM_H_ /** @} */ diff --git a/cpu/avr/dev/usb/storage/conf_access.h b/cpu/avr/dev/usb/storage/conf_access.h index afc38b814..5904327b4 100644 --- a/cpu/avr/dev/usb/storage/conf_access.h +++ b/cpu/avr/dev/usb/storage/conf_access.h @@ -45,8 +45,8 @@ @{ */ -#ifndef _CONF_ACCESS_H_ -#define _CONF_ACCESS_H_ +#ifndef CONF_ACCESS_H_ +#define CONF_ACCESS_H_ // Active the Logical Unit @@ -192,6 +192,6 @@ #define GLOBAL_WR_PROTECT DISABLED // To manage a global write protection -#endif //! _CONF_ACCESS_H_ +#endif //!CONF_ACCESS_H_ /** @} */ diff --git a/cpu/avr/dev/usb/storage/ctrl_access.h b/cpu/avr/dev/usb/storage/ctrl_access.h index a201a5342..878d9850c 100644 --- a/cpu/avr/dev/usb/storage/ctrl_access.h +++ b/cpu/avr/dev/usb/storage/ctrl_access.h @@ -52,8 +52,8 @@ @{ */ -#ifndef _MEM_CTRL_H_ -#define _MEM_CTRL_H_ +#ifndef MEM_CTRL_H_ +#define MEM_CTRL_H_ #include "storage/conf_access.h" #include "storage/ctrl_status.h" @@ -153,5 +153,5 @@ Ctrl_status ram_2_memory( U8 lun , const U32 _MEM_TYPE_SLOW_ *addr , U8 _MEM_ #endif // (ACCESS_STREAM == ENABLED) //-------------------------------------------------------------------------- -#endif // _MEM_CTRL_H_ +#endif //MEM_CTRL_H_ /**@}*/ diff --git a/cpu/avr/dev/usb/storage/ctrl_status.h b/cpu/avr/dev/usb/storage/ctrl_status.h index c79ca549a..969076c86 100644 --- a/cpu/avr/dev/usb/storage/ctrl_status.h +++ b/cpu/avr/dev/usb/storage/ctrl_status.h @@ -52,8 +52,8 @@ @{ */ -#ifndef _CTRL_STATUS_H_ -#define _CTRL_STATUS_H_ +#ifndef CTRL_STATUS_H_ +#define CTRL_STATUS_H_ //_____ D E F I N I T I O N S ______________________________________________ @@ -66,5 +66,5 @@ typedef enum , CTRL_BUSY =(FAIL+2) // Not initialize } Ctrl_status; -#endif // _CTRL_STATUS_H_ +#endif //CTRL_STATUS_H_ /** @} */ diff --git a/cpu/avr/dev/usb/storage/scsi_decoder.h b/cpu/avr/dev/usb/storage/scsi_decoder.h index e0c90a177..65d5b70a2 100644 --- a/cpu/avr/dev/usb/storage/scsi_decoder.h +++ b/cpu/avr/dev/usb/storage/scsi_decoder.h @@ -44,8 +44,8 @@ \addtogroup usbstorage @{ */ -#ifndef _SCSI_DECODER_H_ -#define _SCSI_DECODER_H_ +#ifndef SCSI_DECODER_H_ +#define SCSI_DECODER_H_ //_____ I N C L U D E S ____________________________________________________ @@ -334,5 +334,5 @@ void sbc_lun_status_is_not_present(void); void sbc_lun_status_is_fail(void); void sbc_lun_status_is_protected(void); -#endif /* _SCSI_DECODER_H_ */ +#endif /*SCSI_DECODER_H_ */ /** @} */ diff --git a/cpu/avr/dev/usb/storage/storage_task.h b/cpu/avr/dev/usb/storage/storage_task.h index 0e1a0250a..d1e1b07de 100644 --- a/cpu/avr/dev/usb/storage/storage_task.h +++ b/cpu/avr/dev/usb/storage/storage_task.h @@ -45,8 +45,8 @@ \defgroup usbstorage USB Mass Storage Task @{ */ -#ifndef _STORAGE_TASK_H_ -#define _STORAGE_TASK_H_ +#ifndef STORAGE_TASK_H_ +#define STORAGE_TASK_H_ //_____ I N C L U D E S ____________________________________________________ @@ -65,5 +65,5 @@ void sof_action(void); PROCESS_NAME(storage_process); -#endif /* _STORAGE_TASK_H_ */ +#endif /*STORAGE_TASK_H_ */ /** @} */ diff --git a/cpu/avr/dev/usb/usb_descriptors.h b/cpu/avr/dev/usb/usb_descriptors.h index f5648ebf7..0976c9d42 100644 --- a/cpu/avr/dev/usb/usb_descriptors.h +++ b/cpu/avr/dev/usb/usb_descriptors.h @@ -48,8 +48,8 @@ @{ */ -#ifndef _USB_USERCONFIG_H_ -#define _USB_USERCONFIG_H_ +#ifndef USB_USERCONFIG_H_ +#define USB_USERCONFIG_H_ //_____ I N C L U D E S ____________________________________________________ @@ -543,6 +543,6 @@ U8 Usb_get_dev_desc_length(void); PGM_VOID_P Usb_get_conf_desc_pointer(U8 index) ; U8 Usb_get_conf_desc_length(U8 index); -#endif // _USB_USERCONFIG_H_ +#endif //USB_USERCONFIG_H_ /** @} */ diff --git a/cpu/avr/dev/usb/usb_drv.h b/cpu/avr/dev/usb/usb_drv.h index 63abcdbf3..fd4b45883 100644 --- a/cpu/avr/dev/usb/usb_drv.h +++ b/cpu/avr/dev/usb/usb_drv.h @@ -40,8 +40,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _USB_DRV_H_ -#define _USB_DRV_H_ +#ifndef USB_DRV_H_ +#define USB_DRV_H_ #include "compiler.h" @@ -936,6 +936,6 @@ U8 usb_endpoint_wait_for_IN_ready(); #define usb_endpoint_wait_for_read_enabled usb_endpoint_wait_for_write_enabled -#endif // _USB_DRV_H_ +#endif //USB_DRV_H_ /** @} */ diff --git a/cpu/avr/dev/usb/usb_specific_request.h b/cpu/avr/dev/usb/usb_specific_request.h index cbbecf327..b0c1ab752 100644 --- a/cpu/avr/dev/usb/usb_specific_request.h +++ b/cpu/avr/dev/usb/usb_specific_request.h @@ -41,8 +41,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _USB_SPECIFIC_REQUEST_H_ -#define _USB_SPECIFIC_REQUEST_H_ +#ifndef USB_SPECIFIC_REQUEST_H_ +#define USB_SPECIFIC_REQUEST_H_ /*_____ I N C L U D E S ____________________________________________________*/ @@ -86,5 +86,5 @@ extern usb_mode_t usb_mode; // ____ T Y P E D E F I N I T I O N _______________________________________ -#endif // _USB_SPECIFIC_REQUEST_H_ +#endif //USB_SPECIFIC_REQUEST_H_ diff --git a/cpu/avr/dev/usb/usb_standard_request.h b/cpu/avr/dev/usb/usb_standard_request.h index ef60a4aa3..e5e56ae8e 100644 --- a/cpu/avr/dev/usb/usb_standard_request.h +++ b/cpu/avr/dev/usb/usb_standard_request.h @@ -46,8 +46,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _USB_ENUM_H_ -#define _USB_ENUM_H_ +#ifndef USB_ENUM_H_ +#define USB_ENUM_H_ //_____ I N C L U D E S ____________________________________________________ @@ -84,5 +84,5 @@ void usb_process_request( void); extern U8 usb_configuration_nb; -#endif // _USB_ENUM_H_ +#endif //USB_ENUM_H_ diff --git a/cpu/avr/dev/usb/usb_task.h b/cpu/avr/dev/usb/usb_task.h index 9fefac73d..26dd01541 100644 --- a/cpu/avr/dev/usb/usb_task.h +++ b/cpu/avr/dev/usb/usb_task.h @@ -57,8 +57,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _USB_TASK_H_ -#define _USB_TASK_H_ +#ifndef USB_TASK_H_ +#define USB_TASK_H_ /** \ingroup usbstick @@ -191,6 +191,6 @@ void usb_device_task (void); //! @} -#endif /* _USB_TASK_H_ */ +#endif /*USB_TASK_H_ */ /** @} */ diff --git a/cpu/avr/mtarch.h b/cpu/avr/mtarch.h index a311667b2..5cc25d87e 100644 --- a/cpu/avr/mtarch.h +++ b/cpu/avr/mtarch.h @@ -39,8 +39,8 @@ * */ -#ifndef __MTARCH_H__ -#define __MTARCH_H__ +#ifndef MTARCH_H_ +#define MTARCH_H_ #include "contiki-conf.h" @@ -55,5 +55,5 @@ struct mtarch_thread { unsigned char *sp; }; -#endif /* __MTARCH_H__ */ +#endif /* MTARCH_H_ */ diff --git a/cpu/avr/radio/ieee-manager/ieee-15-4-manager.h b/cpu/avr/radio/ieee-manager/ieee-15-4-manager.h index ba5705ae0..24bd8ce9c 100644 --- a/cpu/avr/radio/ieee-manager/ieee-15-4-manager.h +++ b/cpu/avr/radio/ieee-manager/ieee-15-4-manager.h @@ -46,8 +46,8 @@ * */ -#ifndef __IEEEMANAGER_H__ -#define __IEEEMANAGER_H__ +#ifndef IEEEMANAGER_H_ +#define IEEEMANAGER_H_ /** \brief The interface structure for the 802.15.4 quasi-MAC. */ typedef struct ieee_15_4_manager{ @@ -110,5 +110,5 @@ typedef struct ieee_15_4_manager{ void ieee_15_4_init(struct ieee_15_4_manager *pieee_15_4_manager); -#endif /* __IEEEMANAGER_H__ */ +#endif /* IEEEMANAGER_H_ */ /** \} */ diff --git a/cpu/avr/radio/mac/sicslowmac.h b/cpu/avr/radio/mac/sicslowmac.h index 9edb0f393..c6d3fb97b 100644 --- a/cpu/avr/radio/mac/sicslowmac.h +++ b/cpu/avr/radio/mac/sicslowmac.h @@ -44,8 +44,8 @@ \addtogroup rf230mac */ -#ifndef __SICSLOWMAC_H__ -#define __SICSLOWMAC_H__ +#ifndef SICSLOWMAC_H_ +#define SICSLOWMAC_H_ #include #include @@ -91,4 +91,4 @@ void byte_reverse(uint8_t * bytes, uint8_t num); struct mac_driver * sicslowmac_get_driver(void); parsed_frame_t * sicslowmac_get_frame(void); -#endif /* __SICSLOWMAC_H__ */ +#endif /* SICSLOWMAC_H_ */ diff --git a/cpu/avr/rtimer-arch.h b/cpu/avr/rtimer-arch.h index cf726b383..aad1b3b62 100644 --- a/cpu/avr/rtimer-arch.h +++ b/cpu/avr/rtimer-arch.h @@ -30,8 +30,8 @@ * */ -#ifndef __RTIMER_ARCH_H__ -#define __RTIMER_ARCH_H__ +#ifndef RTIMER_ARCH_H_ +#define RTIMER_ARCH_H_ #include @@ -68,4 +68,4 @@ #endif void rtimer_arch_sleep(rtimer_clock_t howlong); -#endif /* __RTIMER_ARCH_H__ */ +#endif /* RTIMER_ARCH_H_ */ diff --git a/cpu/cc2430/8051def.h b/cpu/cc2430/8051def.h index fe82ce9de..6d89a1fb2 100644 --- a/cpu/cc2430/8051def.h +++ b/cpu/cc2430/8051def.h @@ -9,8 +9,8 @@ * (recent updates for the sensinode/cc2430 port) */ -#ifndef __8051_DEF_H__ -#define __8051_DEF_H__ +#ifndef E051_DEF_H_ +#define E051_DEF_H_ #include @@ -110,4 +110,4 @@ typedef unsigned short clock_time_t; #define uip_ipaddr_copy(dest, src) \ memcpy(dest, src, sizeof(*dest)) -#endif /* __8051_DEF_H__ */ +#endif /* E051_DEF_H_ */ diff --git a/cpu/cc2430/dev/bus.h b/cpu/cc2430/dev/bus.h index 88cffdf94..aa15cf0bd 100644 --- a/cpu/cc2430/dev/bus.h +++ b/cpu/cc2430/dev/bus.h @@ -38,8 +38,8 @@ */ -#ifndef __BUS_H__ -#define __BUS_H__ +#ifndef BUS_H_ +#define BUS_H_ #include "cc2430_sfr.h" #include "8051def.h" @@ -50,4 +50,4 @@ void bus_init(void); void clock_ISR( void ) __interrupt (ST_VECTOR); -#endif /* __BUS_H__ */ +#endif /* BUS_H_ */ diff --git a/cpu/cc2430/dev/cc2430_rf.h b/cpu/cc2430/dev/cc2430_rf.h index f9ec32566..83527d4ba 100644 --- a/cpu/cc2430/dev/cc2430_rf.h +++ b/cpu/cc2430/dev/cc2430_rf.h @@ -5,8 +5,8 @@ * Zach Shelby */ -#ifndef __CC2430_RF_H__ -#define __CC2430_RF_H__ +#ifndef CC2430_RF_H_ +#define CC2430_RF_H_ #include "contiki.h" #include "dev/radio.h" @@ -88,4 +88,4 @@ extern void cc2430_rf_error_ISR(void) __interrupt(RFERR_VECTOR); void rf_dma_callback_isr(void); #endif -#endif /* __CC2430_RF_H__ */ +#endif /* CC2430_RF_H_ */ diff --git a/cpu/cc2430/dev/hwconf.h b/cpu/cc2430/dev/hwconf.h index 1063bf1a8..6d1fad135 100644 --- a/cpu/cc2430/dev/hwconf.h +++ b/cpu/cc2430/dev/hwconf.h @@ -29,8 +29,8 @@ * This file is part of the Contiki operating system. * */ -#ifndef __HWCONF_H__ -#define __HWCONF_H__ +#ifndef HWCONF_H_ +#define HWCONF_H_ #include "sys/cc.h" @@ -145,4 +145,4 @@ static CC_INLINE void name##_IRQ_FLAG_OFF() { \ P2IFG = 0; \ } -#endif /* __HWCONF_H__ */ +#endif /* HWCONF_H_ */ diff --git a/cpu/cc2430/dev/lpm.h b/cpu/cc2430/dev/lpm.h index 4a8f14710..eb1522834 100644 --- a/cpu/cc2430/dev/lpm.h +++ b/cpu/cc2430/dev/lpm.h @@ -39,8 +39,8 @@ * \author * George Oikonomou - */ -#ifndef __LPM_H__ -#define __LPM_H__ +#ifndef LPM_H_ +#define LPM_H_ #include "contiki-conf.h" @@ -54,4 +54,4 @@ #define LPM_MODE LPM_MODE_IDLE #endif /* LPM_CONF_MODE */ -#endif /* __LPM_H__ */ +#endif /* LPM_H_ */ diff --git a/cpu/cc2430/mtarch.h b/cpu/cc2430/mtarch.h index 381737888..9542270a1 100644 --- a/cpu/cc2430/mtarch.h +++ b/cpu/cc2430/mtarch.h @@ -39,11 +39,11 @@ * \author * George Oikonomou - */ -#ifndef __MTARCH_H__ -#define __MTARCH_H__ +#ifndef MTARCH_H_ +#define MTARCH_H_ struct mtarch_thread { unsigned char *sp; }; -#endif /* __MTARCH_H__ */ +#endif /* MTARCH_H_ */ diff --git a/cpu/cc2430/rtimer-arch.h b/cpu/cc2430/rtimer-arch.h index a29f1bae5..f007cff91 100644 --- a/cpu/cc2430/rtimer-arch.h +++ b/cpu/cc2430/rtimer-arch.h @@ -43,8 +43,8 @@ * (rtimer-arch implementation for cc2430) */ -#ifndef __RTIMER_ARCH_H__ -#define __RTIMER_ARCH_H__ +#ifndef RTIMER_ARCH_H_ +#define RTIMER_ARCH_H_ #include "contiki-conf.h" #include "cc2430_sfr.h" @@ -59,4 +59,4 @@ void cc2430_timer_1_ISR(void) __interrupt(T1_VECTOR); -#endif /* __RTIMER_ARCH_H__ */ +#endif /* RTIMER_ARCH_H_ */ diff --git a/cpu/cc2538/mtarch.h b/cpu/cc2538/mtarch.h index 4f696669d..121150d14 100644 --- a/cpu/cc2538/mtarch.h +++ b/cpu/cc2538/mtarch.h @@ -38,11 +38,11 @@ * \author * George Oikonomou - */ -#ifndef __MTARCH_H__ -#define __MTARCH_H__ +#ifndef MTARCH_H_ +#define MTARCH_H_ struct mtarch_thread { unsigned char *sp; }; -#endif /* __MTARCH_H__ */ +#endif /* MTARCH_H_ */ diff --git a/cpu/cc253x/8051def.h b/cpu/cc253x/8051def.h index 2e1d92fd2..03dfc810e 100644 --- a/cpu/cc253x/8051def.h +++ b/cpu/cc253x/8051def.h @@ -9,8 +9,8 @@ * (updates for the cc2530 ports) */ -#ifndef __8051_DEF_H__ -#define __8051_DEF_H__ +#ifndef E051_DEF_H_ +#define E051_DEF_H_ #include @@ -115,4 +115,4 @@ typedef unsigned short clock_time_t; #define uip_ipaddr_copy(dest, src) \ memcpy(dest, src, sizeof(*dest)) -#endif /* __8051_DEF_H__ */ +#endif /* E051_DEF_H_ */ diff --git a/cpu/cc253x/cc253x.h b/cpu/cc253x/cc253x.h index 68bc3a293..4ed93aae7 100644 --- a/cpu/cc253x/cc253x.h +++ b/cpu/cc253x/cc253x.h @@ -42,8 +42,8 @@ * George Oikonomou - */ -#ifndef __CC253X_H__ -#define __CC253X_H__ +#ifndef CC253X_H_ +#define CC253X_H_ /*---------------------------------------------------------------------------*/ /* Compiler Abstraction */ @@ -670,4 +670,4 @@ SFRX(X_P2DIR, 0x70FF); /* Port 2 direction */ SFRX(X_INFOPAGE, 0x7800); /* Start of Information Page */ SFRX(X_IEEE_ADDR, 0x780C); /* Start of unique IEEE Address */ -#endif /* __CC253X_H__ */ +#endif /* CC253X_H_ */ diff --git a/cpu/cc253x/dev/cc2530-rf.h b/cpu/cc253x/dev/cc2530-rf.h index 9d84603d4..f5722db5f 100644 --- a/cpu/cc253x/dev/cc2530-rf.h +++ b/cpu/cc253x/dev/cc2530-rf.h @@ -36,8 +36,8 @@ * \author * George Oikonomou - */ -#ifndef __CC2530_RF_H__ -#define __CC2530_RF_H__ +#ifndef CC2530_RF_H_ +#define CC2530_RF_H_ #include "contiki.h" #include "dev/radio.h" @@ -125,4 +125,4 @@ int8_t cc2530_rf_channel_set(uint8_t channel); uint8_t cc2530_rf_power_set(uint8_t new_power); void cc2530_rf_set_addr(uint16_t pan); /*---------------------------------------------------------------------------*/ -#endif /* __CC2530_RF_H__ */ +#endif /* CC2530_RF_H_ */ diff --git a/cpu/cc253x/dev/clock-isr.h b/cpu/cc253x/dev/clock-isr.h index 005ac38c6..10ea71cb0 100644 --- a/cpu/cc253x/dev/clock-isr.h +++ b/cpu/cc253x/dev/clock-isr.h @@ -35,12 +35,12 @@ * \author * George Oikonomou - */ -#ifndef __CLOCK_ISR_H__ -#define __CLOCK_ISR_H__ +#ifndef CLOCK_ISR_H_ +#define CLOCK_ISR_H_ #include "contiki-conf.h" #include "cc253x.h" void clock_isr(void) __interrupt(ST_VECTOR); -#endif /* __CLOCK_ISR_H__ */ +#endif /* CLOCK_ISR_H_ */ diff --git a/cpu/cc253x/dev/lpm.h b/cpu/cc253x/dev/lpm.h index 4a8f14710..eb1522834 100644 --- a/cpu/cc253x/dev/lpm.h +++ b/cpu/cc253x/dev/lpm.h @@ -39,8 +39,8 @@ * \author * George Oikonomou - */ -#ifndef __LPM_H__ -#define __LPM_H__ +#ifndef LPM_H_ +#define LPM_H_ #include "contiki-conf.h" @@ -54,4 +54,4 @@ #define LPM_MODE LPM_MODE_IDLE #endif /* LPM_CONF_MODE */ -#endif /* __LPM_H__ */ +#endif /* LPM_H_ */ diff --git a/cpu/cc253x/dev/port.h b/cpu/cc253x/dev/port.h index 6fc69d10c..bc0acbfa1 100644 --- a/cpu/cc253x/dev/port.h +++ b/cpu/cc253x/dev/port.h @@ -142,4 +142,4 @@ #define PORT1_0_IRQ_EDGE_R_X() do { PICTL &= ~PICTL_P1ICONL; } while(0) /*---------------------------------------------------------------------------*/ -#endif /* __PORT_H__ */ +#endif /* PORT_H_ */ diff --git a/cpu/cc253x/dev/port2.h b/cpu/cc253x/dev/port2.h index 10f9774ec..cdc87a732 100644 --- a/cpu/cc253x/dev/port2.h +++ b/cpu/cc253x/dev/port2.h @@ -28,8 +28,8 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __CC253x_P2_INTR_H__ -#define __CC253x_P2_INTR_H__ +#ifndef CC253x_P2_INTR_H_ +#define CC253x_P2_INTR_H_ #include "contiki.h" diff --git a/cpu/cc253x/mtarch.h b/cpu/cc253x/mtarch.h index 2272d7a5b..cbbb095c5 100644 --- a/cpu/cc253x/mtarch.h +++ b/cpu/cc253x/mtarch.h @@ -39,11 +39,11 @@ * \author * George Oikonomou - */ -#ifndef __MTARCH_H__ -#define __MTARCH_H__ +#ifndef MTARCH_H_ +#define MTARCH_H_ struct mtarch_thread { unsigned char *sp; }; -#endif /* __MTARCH_H__ */ +#endif /* MTARCH_H_ */ diff --git a/cpu/cc253x/rtimer-arch.h b/cpu/cc253x/rtimer-arch.h index 548628c58..69e27420d 100644 --- a/cpu/cc253x/rtimer-arch.h +++ b/cpu/cc253x/rtimer-arch.h @@ -41,8 +41,8 @@ * (rtimer-arch implementation for cc2430 and then cc253x) */ -#ifndef __RTIMER_ARCH_H__ -#define __RTIMER_ARCH_H__ +#ifndef RTIMER_ARCH_H_ +#define RTIMER_ARCH_H_ #include "contiki-conf.h" #include "cc253x.h" @@ -57,4 +57,4 @@ void rtimer_isr(void) __interrupt(T1_VECTOR); -#endif /* __RTIMER_ARCH_H__ */ +#endif /* RTIMER_ARCH_H_ */ diff --git a/cpu/cc253x/soc.h b/cpu/cc253x/soc.h index bcf858ba0..59ec336fc 100644 --- a/cpu/cc253x/soc.h +++ b/cpu/cc253x/soc.h @@ -38,8 +38,8 @@ */ -#ifndef __SOC_H__ -#define __SOC_H__ +#ifndef SOC_H_ +#define SOC_H_ #ifndef CC2530_LAST_FLASH_BANK @@ -61,4 +61,4 @@ void soc_init(); -#endif /* __SOC_H__ */ +#endif /* SOC_H_ */ diff --git a/cpu/cc253x/usb/common/cdc-acm/cdc-acm.h b/cpu/cc253x/usb/common/cdc-acm/cdc-acm.h index 43b7f1553..4b084281d 100644 --- a/cpu/cc253x/usb/common/cdc-acm/cdc-acm.h +++ b/cpu/cc253x/usb/common/cdc-acm/cdc-acm.h @@ -1,5 +1,5 @@ -#ifndef __CDC_ACM_H__UFV6K50827__ -#define __CDC_ACM_H__UFV6K50827__ +#ifndef CDC_ACM_H_UFV6K50827__ +#define CDC_ACM_H_UFV6K50827__ #include "cdc.h" #include "contiki.h" @@ -21,4 +21,4 @@ const struct usb_cdc_line_coding *usb_cdc_acm_get_line_coding(void); void usb_cdc_acm_set_event_process(struct process *p); -#endif /* __CDC_ACM_H__UFV6K50827__ */ +#endif /* CDC_ACM_H_UFV6K50827__ */ diff --git a/cpu/cc253x/usb/common/cdc-acm/cdc.h b/cpu/cc253x/usb/common/cdc-acm/cdc.h index d4bd987fc..8995e2f63 100644 --- a/cpu/cc253x/usb/common/cdc-acm/cdc.h +++ b/cpu/cc253x/usb/common/cdc-acm/cdc.h @@ -1,5 +1,5 @@ -#ifndef __CDC_H__K1Q26ESJOC__ -#define __CDC_H__K1Q26ESJOC__ +#ifndef CDC_H_K1Q26ESJOC__ +#define CDC_H_K1Q26ESJOC__ #include "usb.h" /* Communication Class */ /* Class code */ @@ -200,4 +200,4 @@ struct usb_cdc_line_coding { Uchar bDataBits; } BYTE_ALIGNED; -#endif /* __CDC_H__K1Q26ESJOC__ */ +#endif /* CDC_H_K1Q26ESJOC__ */ diff --git a/cpu/cc253x/usb/common/descriptors.h b/cpu/cc253x/usb/common/descriptors.h index 30808f744..f54184395 100644 --- a/cpu/cc253x/usb/common/descriptors.h +++ b/cpu/cc253x/usb/common/descriptors.h @@ -1,5 +1,5 @@ -#ifndef __DESCRIPTORS_H__RPFUB8O7OV__ -#define __DESCRIPTORS_H__RPFUB8O7OV__ +#ifndef DESCRIPTORS_H_RPFUB8O7OV__ +#define DESCRIPTORS_H_RPFUB8O7OV__ #ifndef STRUCTGEN #include "usb.h" @@ -7,4 +7,4 @@ extern const struct usb_st_device_descriptor device_descriptor; extern const struct usb_st_configuration_descriptor const *configuration_head; -#endif /* __DESCRIPTORS_H__RPFUB8O7OV__ */ +#endif /* DESCRIPTORS_H_RPFUB8O7OV__ */ diff --git a/cpu/cc253x/usb/common/usb-api.h b/cpu/cc253x/usb/common/usb-api.h index ac63a2d84..b55cd4a5e 100644 --- a/cpu/cc253x/usb/common/usb-api.h +++ b/cpu/cc253x/usb/common/usb-api.h @@ -1,5 +1,5 @@ -#ifndef __USB_API_H__SYN81IFYBN__ -#define __USB_API_H__SYN81IFYBN__ +#ifndef USB_API_H_SYN81IFYBN__ +#define USB_API_H_SYN81IFYBN__ #include "sys/process.h" @@ -124,4 +124,4 @@ unsigned int usb_get_ep_events(uint8_t addr); unsigned int usb_get_current_configuration(void); -#endif /* __USB_API_H__SYN81IFYBN__ */ +#endif /* USB_API_H_SYN81IFYBN__ */ diff --git a/cpu/cc253x/usb/common/usb-arch.h b/cpu/cc253x/usb/common/usb-arch.h index 37f234ac2..a0f6db160 100644 --- a/cpu/cc253x/usb/common/usb-arch.h +++ b/cpu/cc253x/usb/common/usb-arch.h @@ -1,5 +1,5 @@ -#ifndef __USB_ARCH_H__0Z52ZDP0H6__ -#define __USB_ARCH_H__0Z52ZDP0H6__ +#ifndef USB_ARCH_H_0Z52ZDP0H6__ +#define USB_ARCH_H_0Z52ZDP0H6__ #include "contiki-conf.h" #include "usb-api.h" @@ -74,4 +74,4 @@ unsigned int usb_arch_get_global_events(void); /* Return true if not all data has been sent to the host */ int usb_arch_send_pending(uint8_t ep_addr); -#endif /* __USB_ARCH_H__0Z52ZDP0H6__ */ +#endif /* USB_ARCH_H_0Z52ZDP0H6__ */ diff --git a/cpu/cc253x/usb/common/usb-core.h b/cpu/cc253x/usb/common/usb-core.h index aa925014a..ba6304ca2 100644 --- a/cpu/cc253x/usb/common/usb-core.h +++ b/cpu/cc253x/usb/common/usb-core.h @@ -1,5 +1,5 @@ -#ifndef __USB_CORE_H__YIKJDA7S1X__ -#define __USB_CORE_H__YIKJDA7S1X__ +#ifndef USB_CORE_H_YIKJDA7S1X__ +#define USB_CORE_H_YIKJDA7S1X__ #include @@ -16,4 +16,4 @@ typedef void (*usb_ctrl_data_callback)(uint8_t *data, unsigned int length); void usb_get_ctrl_data(uint8_t *data, unsigned int length, usb_ctrl_data_callback cb); -#endif /* __USB_CORE_H__YIKJDA7S1X__ */ +#endif /* USB_CORE_H_YIKJDA7S1X__ */ diff --git a/cpu/cc253x/usb/common/usb.h b/cpu/cc253x/usb/common/usb.h index 86dc3419a..a1d7dfb78 100644 --- a/cpu/cc253x/usb/common/usb.h +++ b/cpu/cc253x/usb/common/usb.h @@ -1,5 +1,5 @@ -#ifndef __USB_H__6PFTDPIMZM__ -#define __USB_H__6PFTDPIMZM__ +#ifndef USB_H_6PFTDPIMZM__ +#define USB_H_6PFTDPIMZM__ #include /* Adapted from usb_kbd_enum.h in c5131-usb-kbd-light-1_0_2 package from @@ -182,4 +182,4 @@ struct usb_st_language_descriptor Uint16 wlangid[1]; /* language id */ } BYTE_ALIGNED; -#endif /* __USB_H__6PFTDPIMZM__ */ +#endif /* USB_H_6PFTDPIMZM__ */ diff --git a/cpu/mc1322x/contiki-mc1322x-conf.h b/cpu/mc1322x/contiki-mc1322x-conf.h index b88331413..e6c65df56 100644 --- a/cpu/mc1322x/contiki-mc1322x-conf.h +++ b/cpu/mc1322x/contiki-mc1322x-conf.h @@ -33,8 +33,8 @@ * */ -#ifndef __CONTIKI_MC1322X_CONF_H__ -#define __CONTIKI_MC1322X_CONF_H__ +#ifndef CONTIKI_MC1322X_CONF_H_ +#define CONTIKI_MC1322X_CONF_H_ typedef int32_t s32_t; diff --git a/cpu/mc1322x/debug-uart.h b/cpu/mc1322x/debug-uart.h index 628e99e8f..0bd1d4f42 100644 --- a/cpu/mc1322x/debug-uart.h +++ b/cpu/mc1322x/debug-uart.h @@ -1,5 +1,5 @@ -#ifndef __DEBUG_UART_H__1V2039076V__ -#define __DEBUG_UART_H__1V2039076V__ +#ifndef DEBUG_UART_H_1V2039076V__ +#define DEBUG_UART_H_1V2039076V__ #ifndef dbg_setup_uart #define dbg_setup_uart dbg_setup_uart_default @@ -24,4 +24,4 @@ dbg_blocking_putchar(const char ch); void dbg_drain(); -#endif /* __DEBUG_UART_H__1V2039076V__ */ +#endif /* DEBUG_UART_H_1V2039076V__ */ diff --git a/cpu/mc1322x/lib/include/maca.h b/cpu/mc1322x/lib/include/maca.h index 4c67bf051..5f1083f38 100644 --- a/cpu/mc1322x/lib/include/maca.h +++ b/cpu/mc1322x/lib/include/maca.h @@ -33,8 +33,8 @@ * */ -#ifndef _MACA_H_ -#define _MACA_H_ +#ifndef MACA_H_ +#define MACA_H_ #include #include @@ -529,4 +529,4 @@ enum maca_status_bits { #define MACA_WRITE(reg, src) (reg = src) #define MACA_READ(reg) reg -#endif // _MACA_H_ +#endif //MACA_H_ diff --git a/cpu/mc1322x/mtarch.h b/cpu/mc1322x/mtarch.h index 540e2b8cf..3b181880a 100644 --- a/cpu/mc1322x/mtarch.h +++ b/cpu/mc1322x/mtarch.h @@ -43,8 +43,8 @@ * */ -#ifndef __MTARCH_H__ -#define __MTARCH_H__ +#ifndef MTARCH_H_ +#define MTARCH_H_ #include "contiki-conf.h" @@ -59,5 +59,5 @@ struct mtarch_thread { unsigned char *sp; }; -#endif /* __MTARCH_H__ */ +#endif /* MTARCH_H_ */ diff --git a/cpu/mc1322x/rtimer-arch.h b/cpu/mc1322x/rtimer-arch.h index 2e8f4acce..5d52b3422 100644 --- a/cpu/mc1322x/rtimer-arch.h +++ b/cpu/mc1322x/rtimer-arch.h @@ -40,8 +40,8 @@ * Mariano Alvira */ -#ifndef __RTIMER_ARCH_H__ -#define __RTIMER_ARCH_H__ +#ifndef RTIMER_ARCH_H_ +#define RTIMER_ARCH_H_ /* contiki */ #include "sys/rtimer.h" @@ -58,4 +58,4 @@ #define rtimer_arch_now() (CRM->RTC_COUNT) -#endif /* __RTIMER_ARCH_H__ */ +#endif /* RTIMER_ARCH_H_ */ diff --git a/cpu/msp430/dev/flash.h b/cpu/msp430/dev/flash.h index 99986be23..ed142b8a1 100644 --- a/cpu/msp430/dev/flash.h +++ b/cpu/msp430/dev/flash.h @@ -36,8 +36,8 @@ * */ -#ifndef __FLASH_H__ -#define __FLASH_H__ +#ifndef FLASH_H_ +#define FLASH_H_ /** * Setup function to be called before any of the flash programming functions. @@ -74,4 +74,4 @@ void flash_write(unsigned short *addr, unsigned short word); */ void flash_clear(unsigned short *addr); -#endif /* __FLASH_H__ */ +#endif /* FLASH_H_ */ diff --git a/cpu/msp430/dev/hwconf.h b/cpu/msp430/dev/hwconf.h index d30937d73..f58c3cd6b 100644 --- a/cpu/msp430/dev/hwconf.h +++ b/cpu/msp430/dev/hwconf.h @@ -29,8 +29,8 @@ * This file is part of the Contiki operating system. * */ -#ifndef __HWCONF_H__ -#define __HWCONF_H__ +#ifndef HWCONF_H_ +#define HWCONF_H_ #include "contiki.h" #include "sys/cc.h" @@ -53,4 +53,4 @@ static CC_INLINE void name##_IRQ_EDGE_SELECTU() {P##port##IES &= ~(1 << bit);}\ static CC_INLINE int name##_CHECK_IRQ() {return P##port##IFG & (1 << bit);} \ static CC_INLINE int name##_IRQ_PORT() {return port;} -#endif /* __HWCONF_H__ */ +#endif /* HWCONF_H_ */ diff --git a/cpu/msp430/dev/lpm.h b/cpu/msp430/dev/lpm.h index 6268d7ada..ccdc08eea 100644 --- a/cpu/msp430/dev/lpm.h +++ b/cpu/msp430/dev/lpm.h @@ -29,8 +29,8 @@ * This file is part of the Contiki operating system. * */ -#ifndef __LPM_H__ -#define __LPM_H__ +#ifndef LPM_H_ +#define LPM_H_ #include "contiki-conf.h" @@ -58,4 +58,4 @@ void lpm_off(void); #define LPM_STATUS_ON 1 -#endif /* __LPM_H__ */ +#endif /* LPM_H_ */ diff --git a/cpu/msp430/dev/uart0.h b/cpu/msp430/dev/uart0.h index 9aef3a583..837906596 100644 --- a/cpu/msp430/dev/uart0.h +++ b/cpu/msp430/dev/uart0.h @@ -37,8 +37,8 @@ * Enric M. Calvo */ -#ifndef __UART0_H__ -#define __UART0_H__ +#ifndef UART0_H_ +#define UART0_H_ #include "contiki.h" @@ -49,4 +49,4 @@ void uart0_writeb(unsigned char c); void uart0_init(unsigned long ubr); uint8_t uart0_active(void); -#endif /* __UART0_H__ */ +#endif /* UART0_H_ */ diff --git a/cpu/msp430/dev/uart1.h b/cpu/msp430/dev/uart1.h index f58764502..90280d4c8 100644 --- a/cpu/msp430/dev/uart1.h +++ b/cpu/msp430/dev/uart1.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __UART1_H__ -#define __UART1_H__ +#ifndef UART1_H_ +#define UART1_H_ #include "contiki.h" @@ -49,4 +49,4 @@ void uart1_writeb(unsigned char c); void uart1_init(unsigned long ubr); uint8_t uart1_active(void); -#endif /* __UART1_H__ */ +#endif /* UART1_H_ */ diff --git a/cpu/msp430/isr_compat.h b/cpu/msp430/isr_compat.h index 5d1a2dcff..5ede95a86 100644 --- a/cpu/msp430/isr_compat.h +++ b/cpu/msp430/isr_compat.h @@ -25,8 +25,8 @@ * */ -#ifndef _ISR_COMPAT_H_ -#define _ISR_COMPAT_H_ +#ifndef ISR_COMPAT_H_ +#define ISR_COMPAT_H_ /* Cross compiler interrupt service routine compatibility definitions */ /* This code currently allows for: diff --git a/cpu/msp430/mtarch.h b/cpu/msp430/mtarch.h index 313c55861..f321bd176 100644 --- a/cpu/msp430/mtarch.h +++ b/cpu/msp430/mtarch.h @@ -28,8 +28,8 @@ * * This file is part of the Contiki operating system. */ -#ifndef __MTARCH_H__ -#define __MTARCH_H__ +#ifndef MTARCH_H_ +#define MTARCH_H_ #include "contiki.h" @@ -48,4 +48,4 @@ struct mt_thread; int mtarch_stack_usage(struct mt_thread *t); -#endif /* __MTARCH_H__ */ +#endif /* MTARCH_H_ */ diff --git a/cpu/msp430/rtimer-arch.h b/cpu/msp430/rtimer-arch.h index 2912789e2..446ef99e1 100644 --- a/cpu/msp430/rtimer-arch.h +++ b/cpu/msp430/rtimer-arch.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __RTIMER_ARCH_H__ -#define __RTIMER_ARCH_H__ +#ifndef RTIMER_ARCH_H_ +#define RTIMER_ARCH_H_ #include "sys/rtimer.h" @@ -50,4 +50,4 @@ rtimer_clock_t rtimer_arch_now(void); -#endif /* __RTIMER_ARCH_H__ */ +#endif /* RTIMER_ARCH_H_ */ diff --git a/cpu/native/mtarch.h b/cpu/native/mtarch.h index e53d52366..d006c1360 100644 --- a/cpu/native/mtarch.h +++ b/cpu/native/mtarch.h @@ -32,11 +32,11 @@ * */ -#ifndef __MTARCH_H__ -#define __MTARCH_H__ +#ifndef MTARCH_H_ +#define MTARCH_H_ struct mtarch_thread { void *mt_thread; }; -#endif /* __MTARCH_H__ */ +#endif /* MTARCH_H_ */ diff --git a/cpu/native/net/tapdev-drv.h b/cpu/native/net/tapdev-drv.h index 3241fc344..a36cee4a4 100644 --- a/cpu/native/net/tapdev-drv.h +++ b/cpu/native/net/tapdev-drv.h @@ -30,8 +30,8 @@ * */ -#ifndef __TAPDEV_DRV_H__ -#define __TAPDEV_DRV_H__ +#ifndef TAPDEV_DRV_H_ +#define TAPDEV_DRV_H_ #include "contiki.h" @@ -40,4 +40,4 @@ PROCESS_NAME(tapdev_process); uint8_t tapdev_output(void); int tapdev_fd(void); -#endif /* __TAPDEV_DRV_H__ */ +#endif /* TAPDEV_DRV_H_ */ diff --git a/cpu/native/net/tapdev.h b/cpu/native/net/tapdev.h index c18b405ec..8132b6000 100644 --- a/cpu/native/net/tapdev.h +++ b/cpu/native/net/tapdev.h @@ -33,12 +33,12 @@ * */ -#ifndef __TAPDEV_H__ -#define __TAPDEV_H__ +#ifndef TAPDEV_H_ +#define TAPDEV_H_ void tapdev_init(void); uint16_t tapdev_poll(void); void tapdev_send(void); void tapdev_exit(void); -#endif /* __TAPDEV_H__ */ +#endif /* TAPDEV_H_ */ diff --git a/cpu/native/net/tapdev6.h b/cpu/native/net/tapdev6.h index 5fbd2f9bd..8549a9b80 100644 --- a/cpu/native/net/tapdev6.h +++ b/cpu/native/net/tapdev6.h @@ -33,8 +33,8 @@ * * */ -#ifndef __TAPDEV_H__ -#define __TAPDEV_H__ +#ifndef TAPDEV_H_ +#define TAPDEV_H_ #include "contiki-net.h" @@ -43,4 +43,4 @@ uint8_t tapdev_send(const uip_lladdr_t *lladdr); uint16_t tapdev_poll(void); void tapdev_do_send(void); void tapdev_exit(void); //math -#endif /* __TAPDEV_H__ */ +#endif /* TAPDEV_H_ */ diff --git a/cpu/native/net/wpcap-drv.h b/cpu/native/net/wpcap-drv.h index 57587a236..4b57bb48a 100644 --- a/cpu/native/net/wpcap-drv.h +++ b/cpu/native/net/wpcap-drv.h @@ -30,8 +30,8 @@ * */ -#ifndef __WPCAP_DRV_H__ -#define __WPCAP_DRV_H__ +#ifndef WPCAP_DRV_H_ +#define WPCAP_DRV_H_ #include "contiki.h" @@ -39,4 +39,4 @@ PROCESS_NAME(wpcap_process); uint8_t wpcap_output(void); -#endif /* __WPCAP_DRV_H__ */ +#endif /* WPCAP_DRV_H_ */ diff --git a/cpu/native/net/wpcap.h b/cpu/native/net/wpcap.h index 04a8ca0a7..964e6b0fc 100644 --- a/cpu/native/net/wpcap.h +++ b/cpu/native/net/wpcap.h @@ -32,8 +32,8 @@ * */ -#ifndef __WPCAP_H__ -#define __WPCAP_H__ +#ifndef WPCAP_H_ +#define WPCAP_H_ void wpcap_init(void); uint16_t wpcap_poll(void); @@ -46,4 +46,4 @@ void wpcap_send(void); #endif void wpcap_exit(void); -#endif /* __WPCAP_H__ */ +#endif /* WPCAP_H_ */ diff --git a/cpu/native/rtimer-arch.h b/cpu/native/rtimer-arch.h index 32d1547fc..8af0c9903 100644 --- a/cpu/native/rtimer-arch.h +++ b/cpu/native/rtimer-arch.h @@ -37,8 +37,8 @@ * Adam Dunkels */ -#ifndef __RTIMER_ARCH_H__ -#define __RTIMER_ARCH_H__ +#ifndef RTIMER_ARCH_H_ +#define RTIMER_ARCH_H_ #include "contiki-conf.h" @@ -46,4 +46,4 @@ #define rtimer_arch_now() clock_time() -#endif /* __RTIMER_ARCH_H__ */ +#endif /* RTIMER_ARCH_H_ */ diff --git a/cpu/pic32/debug-uart.h b/cpu/pic32/debug-uart.h index 96f503909..b87b8d359 100644 --- a/cpu/pic32/debug-uart.h +++ b/cpu/pic32/debug-uart.h @@ -47,8 +47,8 @@ * \date 2012-03-21 */ -#ifndef __DEBUG_UART_H__ -#define __DEBUG_UART_H__ +#ifndef DEBUG_UART_H_ +#define DEBUG_UART_H_ #include diff --git a/cpu/pic32/lib/pic32_clock.h b/cpu/pic32/lib/pic32_clock.h index 9a3509848..c631178e9 100644 --- a/cpu/pic32/lib/pic32_clock.h +++ b/cpu/pic32/lib/pic32_clock.h @@ -47,8 +47,8 @@ * \date 2012-04-11 */ -#ifndef __INCLUDE_PIC32_CLOCK_H__ -#define __INCLUDE_PIC32_CLOCK_H__ +#ifndef INCLUDE_PIC32_CLOCK_H_ +#define INCLUDE_PIC32_CLOCK_H_ #include @@ -69,6 +69,6 @@ uint32_t pic32_clock_get_peripheral_clock(void); /* Function used to calculate the appropriate brg param to approximate desidered frequency */ uint32_t pic32_clock_calculate_brg(uint32_t mul, uint32_t desired); -#endif /* __INCLUDE_PIC32_CLOCK_H__ */ +#endif /* INCLUDE_PIC32_CLOCK_H_ */ /** @} */ diff --git a/cpu/pic32/lib/pic32_irq.h b/cpu/pic32/lib/pic32_irq.h index d47bed11c..e640a3499 100644 --- a/cpu/pic32/lib/pic32_irq.h +++ b/cpu/pic32/lib/pic32_irq.h @@ -55,8 +55,8 @@ * the 3xx and 4xx families of the pic32mx. */ -#ifndef __INCLUDE_PIC32_IRQ_H__ -#define __INCLUDE_PIC32_IRQ_H__ +#ifndef INCLUDE_PIC32_IRQ_H_ +#define INCLUDE_PIC32_IRQ_H_ #define ASM_DIS_INT \ do { \ @@ -74,6 +74,6 @@ void __attribute__((vector(v), interrupt(ipl7))) isr_##v(void) #define ISR(v) \ void __attribute__((vector(v), interrupt(ipl6))) isr_##v(void) -#endif /* __INCLUDE_PIC32_IRQ_H__ */ +#endif /* INCLUDE_PIC32_IRQ_H_ */ /** @} */ diff --git a/cpu/pic32/lib/pic32_spi.h b/cpu/pic32/lib/pic32_spi.h index cbf6600d2..b8053492e 100644 --- a/cpu/pic32/lib/pic32_spi.h +++ b/cpu/pic32/lib/pic32_spi.h @@ -55,8 +55,8 @@ * the 3xx and 4xx families of the pic32mx. */ -#ifndef __INCLUDE_PIC32_SPI_H__ -#define __INCLUDE_PIC32_SPI_H__ +#ifndef INCLUDE_PIC32_SPI_H_ +#define INCLUDE_PIC32_SPI_H_ #ifdef __USE_SPI__ @@ -109,6 +109,6 @@ SPI_DEF(3A) #endif /* __USE_SPI__ */ -#endif /* __INCLUDE_PIC32_SPI_H__ */ +#endif /* INCLUDE_PIC32_SPI_H_ */ /** @} */ diff --git a/cpu/pic32/lib/pic32_timer.h b/cpu/pic32/lib/pic32_timer.h index 7e44140ef..3027af05f 100644 --- a/cpu/pic32/lib/pic32_timer.h +++ b/cpu/pic32/lib/pic32_timer.h @@ -55,8 +55,8 @@ * the 3xx and 4xx families of the pic32mx. */ -#ifndef __INCLUDE_PIC32_TIMER_H__ -#define __INCLUDE_PIC32_TIMER_H__ +#ifndef INCLUDE_PIC32_TIMER_H_ +#define INCLUDE_PIC32_TIMER_H_ #ifdef __USE_TIMER__ @@ -138,6 +138,6 @@ TIMERN_32_DEF(45) #endif /* __USE_TIMER__ */ -#endif /* __INCLUDE_PIC32_TIMER_H__ */ +#endif /* INCLUDE_PIC32_TIMER_H_ */ /** @} */ diff --git a/cpu/pic32/lib/pic32_uart.h b/cpu/pic32/lib/pic32_uart.h index ec062c138..19c029a8a 100644 --- a/cpu/pic32/lib/pic32_uart.h +++ b/cpu/pic32/lib/pic32_uart.h @@ -55,8 +55,8 @@ * the 3xx and 4xx families of the pic32mx. */ -#ifndef __INCLUDE_PIC32_UART_H__ -#define __INCLUDE_PIC32_UART_H__ +#ifndef INCLUDE_PIC32_UART_H_ +#define INCLUDE_PIC32_UART_H_ #ifdef __USE_UART__ @@ -122,6 +122,6 @@ UART_PORT_DEF(3B) #endif /* __USE_UART__ */ -#endif /* __INCLUDE_PIC32_UART_H__ */ +#endif /* INCLUDE_PIC32_UART_H_ */ /** @} */ diff --git a/cpu/pic32/mtarch.h b/cpu/pic32/mtarch.h index 433af7ee1..02e660a5f 100644 --- a/cpu/pic32/mtarch.h +++ b/cpu/pic32/mtarch.h @@ -47,13 +47,13 @@ * \date 2012-03-23 */ -#ifndef __MTARCH_H__ -#define __MTARCH_H__ +#ifndef MTARCH_H_ +#define MTARCH_H_ struct mtarch_thread { short mt_thread; }; -#endif /* __MTARCH_H__ */ +#endif /* MTARCH_H_ */ /** @} */ diff --git a/cpu/pic32/pic32.h b/cpu/pic32/pic32.h index f11d19c80..77a47c92c 100644 --- a/cpu/pic32/pic32.h +++ b/cpu/pic32/pic32.h @@ -47,8 +47,8 @@ * \date 2012-03-23 */ -#ifndef __INCLUDE_PIC32_PIC32_H__ -#define __INCLUDE_PIC32_PIC32_H__ +#ifndef INCLUDE_PIC32_PIC32_H_ +#define INCLUDE_PIC32_PIC32_H_ /* * PIC32MX795F512L - Specific Functions @@ -94,6 +94,6 @@ void pic32_init(void); -#endif /* __INCLUDE_PIC32_PIC32_H__ */ +#endif /* INCLUDE_PIC32_PIC32_H_ */ /** @} */ diff --git a/cpu/pic32/rtimer-arch.h b/cpu/pic32/rtimer-arch.h index 2be3702b5..0b0ad8657 100644 --- a/cpu/pic32/rtimer-arch.h +++ b/cpu/pic32/rtimer-arch.h @@ -47,8 +47,8 @@ * \date 2012-04-11 */ -#ifndef __RTIMER_ARCH_H__ -#define __RTIMER_ARCH_H__ +#ifndef RTIMER_ARCH_H_ +#define RTIMER_ARCH_H_ #include "contiki-conf.h" @@ -58,6 +58,6 @@ rtimer_clock_t rtimer_arch_now(void); #define RTIMER_ARCH_SECOND 312500 -#endif /* __RTIMER_ARCH_H__ */ +#endif /* RTIMER_ARCH_H_ */ /** @} */ diff --git a/cpu/stm32w108/dev/stm32w-radio.h b/cpu/stm32w108/dev/stm32w-radio.h index 7b73f573a..3abd376b4 100644 --- a/cpu/stm32w108/dev/stm32w-radio.h +++ b/cpu/stm32w108/dev/stm32w-radio.h @@ -41,8 +41,8 @@ * Adam Dunkels */ -#ifndef __STM32W_H__ -#define __STM32W_H__ +#ifndef STM32W_H_ +#define STM32W_H_ #include "contiki.h" #include "dev/radio.h" @@ -59,5 +59,5 @@ short last_packet_rssi(); int stm32w_radio_is_on(void); -#endif /* __STM32W_H__ */ +#endif /* STM32W_H_ */ /** @} */ diff --git a/cpu/stm32w108/dev/uart1.h b/cpu/stm32w108/dev/uart1.h index bc684838e..d9711ac6c 100644 --- a/cpu/stm32w108/dev/uart1.h +++ b/cpu/stm32w108/dev/uart1.h @@ -41,8 +41,8 @@ * Adam Dunkels */ -#ifndef __UART1_H__ -#define __UART1_H__ +#ifndef UART1_H_ +#define UART1_H_ #define BAUD2UBR(baud) baud @@ -54,5 +54,5 @@ void uart1_init(unsigned long ubr); /* uint8_t uart1_active(void); */ -#endif /* __UART1_H__ */ +#endif /* UART1_H_ */ /** @} */ diff --git a/cpu/stm32w108/e_stdio/src/mbctype.h b/cpu/stm32w108/e_stdio/src/mbctype.h index 6abcf3db0..2c3e740e9 100644 --- a/cpu/stm32w108/e_stdio/src/mbctype.h +++ b/cpu/stm32w108/e_stdio/src/mbctype.h @@ -1,6 +1,6 @@ -#ifndef _MBCTYPE_H_ +#ifndef MBCTYPE_H_ -#define _MBCTYPE_H_ +#define MBCTYPE_H_ /* escape character used for JIS encoding */ #define ESC_CHAR 0x1b @@ -17,4 +17,4 @@ int _EXFUN(_isjis, (int c)); #define _iseucjp(c) ((c) >= 0xa1 && (c) <= 0xfe) #define _isjis(c) ((c) >= 0x21 && (c) <= 0x7e) -#endif /* _MBCTYPE_H_ */ +#endif /*MBCTYPE_H_ */ diff --git a/cpu/stm32w108/hal/error.h b/cpu/stm32w108/hal/error.h index 68ce42eb6..190b93e17 100644 --- a/cpu/stm32w108/hal/error.h +++ b/cpu/stm32w108/hal/error.h @@ -7,8 +7,8 @@ * */ -#ifndef __ERRORS_H__ -#define __ERRORS_H__ +#ifndef ERRORS_H_ +#define ERRORS_H_ /** * @brief Return type for St functions. @@ -48,7 +48,7 @@ enum { #undef DEFINE_ERROR -#endif // __ERRORS_H__ +#endif // ERRORS_H_ /**@} // End of addtogroup */ diff --git a/cpu/stm32w108/hal/hal.h b/cpu/stm32w108/hal/hal.h index e0161af3a..6050d1080 100644 --- a/cpu/stm32w108/hal/hal.h +++ b/cpu/stm32w108/hal/hal.h @@ -26,8 +26,8 @@ */ -#ifndef __HAL_H__ -#define __HAL_H__ +#ifndef HAL_H_ +#define HAL_H_ // Keep micro first for specifics used by other headers #include "micro/micro-common.h" @@ -38,5 +38,5 @@ #include "hal/micro/cortexm3/uart.h" #include "hal/micro/adc.h" -#endif //__HAL_H__ +#endif //HAL_H_ diff --git a/cpu/stm32w108/hal/micro/adc.h b/cpu/stm32w108/hal/micro/adc.h index c60067cd3..75d2eeeb5 100644 --- a/cpu/stm32w108/hal/micro/adc.h +++ b/cpu/stm32w108/hal/micro/adc.h @@ -31,8 +31,8 @@ * *@{ */ -#ifndef __ADC_H__ -#define __ADC_H__ +#ifndef ADC_H_ +#define ADC_H_ #ifdef CORTEXM3_STM32W108 @@ -314,7 +314,7 @@ boolean halAdcGetRange(void); #include "micro/cortexm3/stm32f103ret/adc.h" #endif /* CORTEXM3_STM32F103 */ -#endif // __ADC_H__ +#endif // ADC_H_ /** @} // END addtogroup */ diff --git a/cpu/stm32w108/hal/micro/button.h b/cpu/stm32w108/hal/micro/button.h index 9dcbf0027..6ef8df7de 100644 --- a/cpu/stm32w108/hal/micro/button.h +++ b/cpu/stm32w108/hal/micro/button.h @@ -4,8 +4,8 @@ * */ -#ifndef _BUTTON_H_ -#define _BUTTON_H_ +#ifndef BUTTON_H_ +#define BUTTON_H_ /* button status */ #define BUTTON_PRESSED 0 @@ -23,6 +23,6 @@ void halInitButton(void); /** @brief Get button status */ uint8_t halGetButtonStatus(HalBoardButton button); -#endif /* _BUTTON_H_ */ +#endif /*BUTTON_H_ */ /******************* (C) COPYRIGHT 2009 STMicroelectronics *****END OF FILE****/ diff --git a/cpu/stm32w108/hal/micro/cortexm3/bootloader/fib-bootloader.h b/cpu/stm32w108/hal/micro/cortexm3/bootloader/fib-bootloader.h index b0b631fe0..ef6651795 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/bootloader/fib-bootloader.h +++ b/cpu/stm32w108/hal/micro/cortexm3/bootloader/fib-bootloader.h @@ -4,8 +4,8 @@ * */ -#ifndef __FIB_BOOTLOADER_H__ -#define __FIB_BOOTLOADER_H__ +#ifndef FIB_BOOTLOADER_H_ +#define FIB_BOOTLOADER_H_ //------------------------------------------------------------------------------ // Reset signatures. @@ -53,4 +53,4 @@ FibStatus fibFlashWrite(uint32_t address, uint8_t *data, FibStatus fibFlashErase(FibEraseType eraseType, uint32_t address); -#endif //__FIB_BOOTLOADER_H__ +#endif //FIB_BOOTLOADER_H_ diff --git a/cpu/stm32w108/hal/micro/cortexm3/compiler/asm.h b/cpu/stm32w108/hal/micro/cortexm3/compiler/asm.h index ccc5de4da..992e4efea 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/compiler/asm.h +++ b/cpu/stm32w108/hal/micro/cortexm3/compiler/asm.h @@ -1,5 +1,5 @@ -#ifndef __ASM_H__ -#define __ASM_H__ +#ifndef ASM_H_ +#define ASM_H_ #ifdef __IAR_SYSTEMS_ASM__ @@ -54,4 +54,4 @@ #endif // __GNUC__ -#endif // __ASM_H__ +#endif // ASM_H_ diff --git a/cpu/stm32w108/hal/micro/cortexm3/compiler/gnu.h b/cpu/stm32w108/hal/micro/cortexm3/compiler/gnu.h index 158ccb4ba..66fee590c 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/compiler/gnu.h +++ b/cpu/stm32w108/hal/micro/cortexm3/compiler/gnu.h @@ -15,8 +15,8 @@ *@{ */ -#ifndef __GNU_H__ -#define __GNU_H__ +#ifndef GNU_H_ +#define GNU_H_ #include @@ -536,7 +536,7 @@ int abs(int I); #include "hal/micro/generic/compiler/platform-common.h" #undef PLATCOMMONOKTOINCLUDE -#endif // __GNU_H__ +#endif // GNU_H_ /** @} END addtogroup */ diff --git a/cpu/stm32w108/hal/micro/cortexm3/compiler/iar.h b/cpu/stm32w108/hal/micro/cortexm3/compiler/iar.h index 68f0353d4..f9046cd32 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/compiler/iar.h +++ b/cpu/stm32w108/hal/micro/cortexm3/compiler/iar.h @@ -16,8 +16,8 @@ *@{ */ -#ifndef __IAR_H__ -#define __IAR_H__ +#ifndef IAR_H_ +#define IAR_H_ #ifndef __ICCARM__ #error Improper PLATFORM_HEADER @@ -529,7 +529,7 @@ int abs(int I); #include "hal/micro/generic/compiler/platform-common.h" #undef PLATCOMMONOKTOINCLUDE -#endif // __IAR_H__ +#endif // IAR_H_ /** @} END addtogroup */ diff --git a/cpu/stm32w108/hal/micro/cortexm3/flash.h b/cpu/stm32w108/hal/micro/cortexm3/flash.h index 90d6c20c9..3404736f5 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/flash.h +++ b/cpu/stm32w108/hal/micro/cortexm3/flash.h @@ -19,8 +19,8 @@ *@{ */ -#ifndef __FLASH_H__ -#define __FLASH_H__ +#ifndef FLASH_H_ +#define FLASH_H_ #include "memmap.h" @@ -120,7 +120,7 @@ StStatus halInternalCibOptionByteWrite(uint8_t byte, uint8_t data); #endif //DOXYGEN_SHOULD_SKIP_THIS -#endif //__FLASH_H__ +#endif //FLASH_H_ /** @} END addtogroup */ diff --git a/cpu/stm32w108/hal/micro/cortexm3/memmap-fat.h b/cpu/stm32w108/hal/micro/cortexm3/memmap-fat.h index 0587e1fa8..80d741cea 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/memmap-fat.h +++ b/cpu/stm32w108/hal/micro/cortexm3/memmap-fat.h @@ -3,10 +3,10 @@ * * */ -#ifndef __MEMMAP_FAT_H__ -#define __MEMMAP_FAT_H__ +#ifndef MEMMAP_FAT_H_ +#define MEMMAP_FAT_H_ -#ifndef __MEMMAP_TABLES_H__ +#ifndef MEMMAP_TABLES_H_ // if we weren't included via memmap-tables.h, define a dummy type for the BAT typedef void HalBootloaderAddressTableType; #endif @@ -48,4 +48,4 @@ extern const HalFixedAddressTableType halFixedAddressTable; #define FAT_MAJOR_VERSION_MASK (0xFF00) -#endif //__MEMMAP_FAT_H__ +#endif //MEMMAP_FAT_H_ diff --git a/cpu/stm32w108/hal/micro/cortexm3/memmap.h b/cpu/stm32w108/hal/micro/cortexm3/memmap.h index 4849a4b23..3117696ad 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/memmap.h +++ b/cpu/stm32w108/hal/micro/cortexm3/memmap.h @@ -3,8 +3,8 @@ * * */ -#ifndef __MEMMAP_H__ -#define __MEMMAP_H__ +#ifndef MEMMAP_H_ +#define MEMMAP_H_ // Include the chip specific definitions #ifndef LOADER @@ -62,5 +62,5 @@ typedef struct { // Hal only references the FAT #include "memmap-fat.h" -#endif //__MEMMMAP_H__ +#endif //MEMMMAP_H_ diff --git a/cpu/stm32w108/hal/micro/cortexm3/mfg-token.h b/cpu/stm32w108/hal/micro/cortexm3/mfg-token.h index b7a14ed20..f05ac216d 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/mfg-token.h +++ b/cpu/stm32w108/hal/micro/cortexm3/mfg-token.h @@ -4,8 +4,8 @@ * */ -#ifndef __MFG_TOKEN_H__ -#define __MFG_TOKEN_H__ +#ifndef MFG_TOKEN_H_ +#define MFG_TOKEN_H_ // The manufacturing tokens live in the Info Blocks, while all other tokens @@ -160,4 +160,4 @@ void halInternalSetMfgTokenData(uint16_t token, void *data, uint8_t len); #endif //DOXYGEN_SHOULD_SKIP_THIS -#endif //__MFG_TOKEN_H__ +#endif //MFG_TOKEN_H_ diff --git a/cpu/stm32w108/hal/micro/cortexm3/micro-common.h b/cpu/stm32w108/hal/micro/cortexm3/micro-common.h index b7117c123..de555a15b 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/micro-common.h +++ b/cpu/stm32w108/hal/micro/cortexm3/micro-common.h @@ -11,8 +11,8 @@ *@{ */ -#ifndef __STM32W108XX_MICRO_COMMON_H__ -#define __STM32W108XX_MICRO_COMMON_H__ +#ifndef STM32W108XX_MICRO_COMMON_H_ +#define STM32W108XX_MICRO_COMMON_H_ #ifndef DOXYGEN_SHOULD_SKIP_THIS #ifndef __STSTATUS_TYPE__ @@ -285,7 +285,7 @@ void halCommonSeedRandom(uint32_t seed); */ uint16_t halCommonGetRandom(void); -#endif //__STM32W108XX_MICRO_COMMON_H__ +#endif //STM32W108XX_MICRO_COMMON_H_ /**@} // END micro group */ diff --git a/cpu/stm32w108/hal/micro/cortexm3/mpu.h b/cpu/stm32w108/hal/micro/cortexm3/mpu.h index 616270e12..840437448 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/mpu.h +++ b/cpu/stm32w108/hal/micro/cortexm3/mpu.h @@ -4,9 +4,9 @@ */ -#ifndef __MPU_H__ -#define __MPU_H__ +#ifndef MPU_H_ +#define MPU_H_ #define BYPASS_MPU(blah) blah -#endif//__MPU_H__ +#endif//MPU_H_ diff --git a/cpu/stm32w108/hal/micro/cortexm3/nvm-def.h b/cpu/stm32w108/hal/micro/cortexm3/nvm-def.h index 1bf54d8f7..aad7f2ae9 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/nvm-def.h +++ b/cpu/stm32w108/hal/micro/cortexm3/nvm-def.h @@ -29,8 +29,8 @@ *@{ */ -#ifndef __NVM_DEF_H__ -#define __NVM_DEF_H__ +#ifndef NVM_DEF_H_ +#define NVM_DEF_H_ //The bottom 64 bytes of NVM storage is allocated to radio calibration //values. These 64 bytes *must* exist for the radio to function. @@ -49,5 +49,5 @@ /** @} END addtogroup */ -#endif // __NVM_DEF_H__ +#endif // NVM_DEF_H_ diff --git a/cpu/stm32w108/hal/micro/cortexm3/nvm.h b/cpu/stm32w108/hal/micro/cortexm3/nvm.h index a1f0e3591..8f9bea60d 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/nvm.h +++ b/cpu/stm32w108/hal/micro/cortexm3/nvm.h @@ -170,8 +170,8 @@ */ -#ifndef __NVM_H__ -#define __NVM_H__ +#ifndef NVM_H_ +#define NVM_H_ //Pull in the MFB_ definitions. #include "hal/micro/cortexm3/memmap.h" @@ -275,5 +275,5 @@ StStatus halCommonWriteToNvm(const void *data, uint32_t offset, uint16_t length) /** @} END addtogroup */ -#endif // __NVM_H__ +#endif // NVM_H_ diff --git a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/board.h b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/board.h index aaf9de78d..1619ee81d 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/board.h +++ b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/board.h @@ -7,8 +7,8 @@ * * */ -#ifndef _BOARD_H_ -#define _BOARD_H_ +#ifndef BOARD_H_ +#define BOARD_H_ /** @addtogroup board * @brief ST board abstraction layer @@ -253,7 +253,7 @@ void halBoardPowerUp(void); */ void halBoardPowerDown(void); -#endif /* _BOARD_H_ */ +#endif /*BOARD_H_ */ /** @} // END addtogroup */ diff --git a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/memmap.h b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/memmap.h index 171eea204..861036a9c 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/memmap.h +++ b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/memmap.h @@ -4,12 +4,12 @@ * */ -#ifndef __MEMMAP_H__ +#ifndef MEMMAP_H_ #error This header should not be included directly, use hal/micro/cortexm3/memmap.h #endif -#ifndef __STM32W108_MEMMAP_H__ -#define __STM32W108_MEMMAP_H__ +#ifndef STM32W108_MEMMAP_H_ +#define STM32W108_MEMMAP_H_ #define RAM_BOTTOM (0x20000000u) #define RAM_SIZE_B (0x2000) @@ -54,4 +54,4 @@ #define PAGE_TO_PROG_ADDR(x) ((((uint32_t)(x)) << 10)|MFB_BOTTOM) -#endif //__STM32W108_MEMMAP_H__ +#endif //STM32W108_MEMMAP_H_ diff --git a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/regs.h b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/regs.h index aab30182a..5c60f682a 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/regs.h +++ b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/regs.h @@ -1,5 +1,5 @@ -#ifndef __REGS_H__ -#define __REGS_H__ 1 +#ifndef REGS_H_ +#define REGS_H_ 1 #define ReadRegister(a) a @@ -11541,4 +11541,4 @@ #define DATA_VENDOR_SIZE (DATA_VENDOR_END - DATA_VENDOR_BASE + 1) -#endif /*__REGS_H__*/ +#endif /*REGS_H_*/ diff --git a/cpu/stm32w108/hal/micro/cortexm3/uart.h b/cpu/stm32w108/hal/micro/cortexm3/uart.h index 2eb45c0af..c15bf051d 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/uart.h +++ b/cpu/stm32w108/hal/micro/cortexm3/uart.h @@ -5,8 +5,8 @@ * */ -#ifndef __UART_MIN_H__ -#define __UART_MIN_H__ +#ifndef UART_MIN_H_ +#define UART_MIN_H_ #ifdef __ICCARM__ #include #endif @@ -69,4 +69,4 @@ int __io_getchar(void); void __io_flush( void ); -#endif //__UART_MIN_H__ +#endif //UART_MIN_H_ diff --git a/cpu/stm32w108/hal/micro/generic/compiler/platform-common.h b/cpu/stm32w108/hal/micro/generic/compiler/platform-common.h index ee56fa6df..92f65625c 100644 --- a/cpu/stm32w108/hal/micro/generic/compiler/platform-common.h +++ b/cpu/stm32w108/hal/micro/generic/compiler/platform-common.h @@ -22,8 +22,8 @@ #error platform-common.h should not be included directly #endif -#ifndef __PLATFORMCOMMON_H__ -#define __PLATFORMCOMMON_H__ +#ifndef PLATFORMCOMMON_H_ +#define PLATFORMCOMMON_H_ //////////////////////////////////////////////////////////////////////////////// // Many of the common definitions must be explicitly enabled by the // particular PLATFORM_HEADER being used @@ -345,7 +345,7 @@ -#endif //__PLATFORMCOMMON_H__ +#endif //PLATFORMCOMMON_H_ /** @} END addtogroup */ diff --git a/cpu/stm32w108/hal/micro/mems-regs.h b/cpu/stm32w108/hal/micro/mems-regs.h index 63c21418d..69acddd2c 100644 --- a/cpu/stm32w108/hal/micro/mems-regs.h +++ b/cpu/stm32w108/hal/micro/mems-regs.h @@ -4,8 +4,8 @@ * */ -#ifndef _MEMS_REGS_H_ -#define _MEMS_REGS_H_ +#ifndef MEMS_REGS_H_ +#define MEMS_REGS_H_ //---Size of MEMs data--- #define MEMS_DATA_SIZE 6 @@ -121,5 +121,5 @@ uint8_t i2c_read_reg (uint8_t slave_addr, uint8_t reg_addr, uint8_t *pBuffer, ui //-reg_value is the value of the register to be written---// uint8_t i2c_write_reg (uint8_t slave_addr, uint8_t reg_addr, uint8_t reg_value); -#endif /* _MEMS_REGS_H_ */ +#endif /*MEMS_REGS_H_ */ diff --git a/cpu/stm32w108/hal/micro/mems.h b/cpu/stm32w108/hal/micro/mems.h index 9b0649f66..5dc4e53d5 100644 --- a/cpu/stm32w108/hal/micro/mems.h +++ b/cpu/stm32w108/hal/micro/mems.h @@ -5,8 +5,8 @@ * */ -#ifndef _MEMS_H_ -#define _MEMS_H_ +#ifndef MEMS_H_ +#define MEMS_H_ #include "hal/micro/mems-regs.h" @@ -32,5 +32,5 @@ uint8_t mems_Init(void); */ uint8_t mems_GetValue(t_mems_data *mems_data); -#endif /* _MEMS_H_ */ +#endif /*MEMS_H_ */ diff --git a/cpu/stm32w108/hal/micro/micro-common.h b/cpu/stm32w108/hal/micro/micro-common.h index 75ce88cb0..6e43c2be0 100644 --- a/cpu/stm32w108/hal/micro/micro-common.h +++ b/cpu/stm32w108/hal/micro/micro-common.h @@ -12,8 +12,8 @@ *@{ */ -#ifndef __MICRO_COMMON_H__ -#define __MICRO_COMMON_H__ +#ifndef MICRO_COMMON_H_ +#define MICRO_COMMON_H_ #ifndef DOXYGEN_SHOULD_SKIP_THIS #ifndef __STSTATUS_TYPE__ @@ -141,7 +141,7 @@ StStatus halBootloaderStart(uint8_t mode, uint8_t channel, uint16_t panId); #include "micro/cortexm3/micro-common.h" #endif -#endif //__MICRO_COMMON_H__ +#endif //MICRO_COMMON_H_ /** @} END micro group */ diff --git a/cpu/stm32w108/hal/micro/system-timer.h b/cpu/stm32w108/hal/micro/system-timer.h index c2df6166e..703a58fa7 100644 --- a/cpu/stm32w108/hal/micro/system-timer.h +++ b/cpu/stm32w108/hal/micro/system-timer.h @@ -29,8 +29,8 @@ *@{ */ -#ifndef __SYSTEM_TIMER_H__ -#define __SYSTEM_TIMER_H__ +#ifndef SYSTEM_TIMER_H_ +#define SYSTEM_TIMER_H_ /** * @brief Initializes the system tick. @@ -72,7 +72,7 @@ uint32_t halCommonGetInt32uMillisecondTick(void); */ uint16_t halCommonGetInt16uQuarterSecondTick(void); -#endif //__SYSTEM_TIMER_H__ +#endif //SYSTEM_TIMER_H_ /**@} //END addtogroup */ diff --git a/cpu/stm32w108/hal/micro/temperature-sensor.h b/cpu/stm32w108/hal/micro/temperature-sensor.h index d012a9bf4..7965e8a0f 100644 --- a/cpu/stm32w108/hal/micro/temperature-sensor.h +++ b/cpu/stm32w108/hal/micro/temperature-sensor.h @@ -4,8 +4,8 @@ * * */ -#ifndef _TEMP_SENSOR_H_ -#define _TEMP_SENSOR_H_ +#ifndef TEMP_SENSOR_H_ +#define TEMP_SENSOR_H_ /* Include --------------------------------------------------------------------*/ #include "hal/micro/adc.h" @@ -23,5 +23,5 @@ void temperatureSensor_Init(void); */ uint32_t temperatureSensor_GetValue(void); -#endif /* _TEMP_SENSOR_H_ */ +#endif /*TEMP_SENSOR_H_ */ diff --git a/cpu/stm32w108/mtarch.h b/cpu/stm32w108/mtarch.h index 91615bda7..49e40f64d 100644 --- a/cpu/stm32w108/mtarch.h +++ b/cpu/stm32w108/mtarch.h @@ -40,12 +40,12 @@ */ -#ifndef __MTARCH_H__ -#define __MTARCH_H__ +#ifndef MTARCH_H_ +#define MTARCH_H_ struct mtarch_thread { short mt_thread; }; -#endif /* __MTARCH_H__ */ +#endif /* MTARCH_H_ */ /** @} */ diff --git a/cpu/stm32w108/rtimer-arch.h b/cpu/stm32w108/rtimer-arch.h index 638136d2f..2247df78e 100644 --- a/cpu/stm32w108/rtimer-arch.h +++ b/cpu/stm32w108/rtimer-arch.h @@ -42,8 +42,8 @@ * Salvatore Pitrulli */ -#ifndef __RTIMER_ARCH_H__ -#define __RTIMER_ARCH_H__ +#ifndef RTIMER_ARCH_H_ +#define RTIMER_ARCH_H_ #define RTIMER_ARCH_RES_341US 0 #define RTIMER_ARCH_RES_171US 1 @@ -93,5 +93,5 @@ void rtimer_arch_disable_irq(void); void rtimer_arch_enable_irq(void); -#endif /* __RTIMER_ARCH_H__ */ +#endif /* RTIMER_ARCH_H_ */ /** @} */ diff --git a/cpu/stm32w108/simplemac/include/phy-library.h b/cpu/stm32w108/simplemac/include/phy-library.h index ca21a83e6..e1d953cce 100644 --- a/cpu/stm32w108/simplemac/include/phy-library.h +++ b/cpu/stm32w108/simplemac/include/phy-library.h @@ -51,7 +51,7 @@ #define MIN_RADIO_POWER -43 // dBm #define MAX_RADIO_POWER 3 // dBm -#ifndef __PHY_H__ +#ifndef PHY_H_ enum { ST_RADIO_POWER_MODE_RX_ON, ST_RADIO_POWER_MODE_OFF @@ -78,7 +78,7 @@ typedef struct { u8 backoffExponentMax; // Backoff exponent for the final CCA attempt(s). boolean appendCrc; // Append CRC to transmitted packets. } RadioTransmitConfig; -#endif// __PHY_H__ +#endif// PHY_H_ #ifndef ST_TYPES_H /** diff --git a/cpu/stm32w108/small-printf/vfieeefp.h b/cpu/stm32w108/small-printf/vfieeefp.h index ead4067f4..7a2d5b627 100644 --- a/cpu/stm32w108/small-printf/vfieeefp.h +++ b/cpu/stm32w108/small-printf/vfieeefp.h @@ -32,8 +32,8 @@ dmg@research.att.com or research!dmg */ -#ifndef __VFIEEEFP_H__ -#define __VFIEEEFP_H__ +#ifndef VFIEEEFP_H_ +#define VFIEEEFP_H_ /* * This header file is a modification of mprec.h that only contains floating @@ -295,5 +295,5 @@ union double_union #endif #endif -#endif /* __VFIEEEFP_H__ */ +#endif /* VFIEEEFP_H_ */ /** @} */ diff --git a/cpu/x86/mtarch.h b/cpu/x86/mtarch.h index a85280e3d..9f982828a 100644 --- a/cpu/x86/mtarch.h +++ b/cpu/x86/mtarch.h @@ -28,8 +28,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ -#ifndef __MTARCH_H__ -#define __MTARCH_H__ +#ifndef MTARCH_H_ +#define MTARCH_H_ #ifndef MTARCH_STACKSIZE #define MTARCH_STACKSIZE 1024 @@ -45,5 +45,5 @@ struct mt_thread; int mtarch_stack_usage(struct mt_thread *t); -#endif /* __MTARCH_H__ */ +#endif /* MTARCH_H_ */ diff --git a/examples/er-rest-example/project-conf.h b/examples/er-rest-example/project-conf.h index 8f6ddd062..128ccd0b2 100644 --- a/examples/er-rest-example/project-conf.h +++ b/examples/er-rest-example/project-conf.h @@ -29,8 +29,8 @@ * */ -#ifndef __PROJECT_ERBIUM_CONF_H__ -#define __PROJECT_ERBIUM_CONF_H__ +#ifndef PROJECT_ERBIUM_CONF_H_ +#define PROJECT_ERBIUM_CONF_H_ /* Some platforms have weird includes. */ #undef IEEE802154_CONF_PANID @@ -85,4 +85,4 @@ #undef SICSLOWPAN_CONF_FRAG #define SICSLOWPAN_CONF_FRAG 1 -#endif /* __PROJECT_ERBIUM_CONF_H__ */ +#endif /* PROJECT_ERBIUM_CONF_H_ */ diff --git a/examples/ipv6/json-ws/json-ws.h b/examples/ipv6/json-ws/json-ws.h index 7484b06d9..8c9e2a764 100644 --- a/examples/ipv6/json-ws/json-ws.h +++ b/examples/ipv6/json-ws/json-ws.h @@ -38,8 +38,8 @@ * Joel Hoglund */ -#ifndef __JSON_WS_H__ -#define __JSON_WS_H__ +#ifndef JSON_WS_H_ +#define JSON_WS_H_ #include "jsontree.h" @@ -55,4 +55,4 @@ extern struct jsontree_callback json_leds_callback; #endif extern struct jsontree_object cosm_tree; -#endif /* __JSON_WS_H__ */ +#endif /* JSON_WS_H_ */ diff --git a/examples/ipv6/json-ws/project-conf.h b/examples/ipv6/json-ws/project-conf.h index 38e5426a7..51e00b55b 100644 --- a/examples/ipv6/json-ws/project-conf.h +++ b/examples/ipv6/json-ws/project-conf.h @@ -27,8 +27,8 @@ * SUCH DAMAGE. */ -#ifndef __PROJECT_CONF_H__ -#define __PROJECT_CONF_H__ +#ifndef PROJECT_CONF_H_ +#define PROJECT_CONF_H_ #include "jsontree.h" #define HTTPD_WS_CONF_USER_STATE struct jsontree_context json @@ -74,4 +74,4 @@ #undef WEBSERVER_CONF_CFS_CONNS #define WEBSERVER_CONF_CFS_CONNS 3 -#endif /* __PROJECT_CONF_H__ */ +#endif /* PROJECT_CONF_H_ */ diff --git a/examples/ipv6/native-border-router/border-router-cmds.h b/examples/ipv6/native-border-router/border-router-cmds.h index 38fc92111..6dcef36a0 100644 --- a/examples/ipv6/native-border-router/border-router-cmds.h +++ b/examples/ipv6/native-border-router/border-router-cmds.h @@ -35,8 +35,8 @@ * Joakim Eriksson */ -#ifndef __BORDER_ROUTER_CMDS_H__ -#define __BORDER_ROUTER_CMDS_H__ +#ifndef BORDER_ROUTER_CMDS_H_ +#define BORDER_ROUTER_CMDS_H_ #define CMD_CONTEXT_RADIO 0 #define CMD_CONTEXT_STDIO 1 @@ -45,4 +45,4 @@ extern uint8_t command_context; PROCESS_NAME(border_router_cmd_process); -#endif /* __BORDER_ROUTER_CMDS_H__ */ +#endif /* BORDER_ROUTER_CMDS_H_ */ diff --git a/examples/ipv6/native-border-router/border-router.h b/examples/ipv6/native-border-router/border-router.h index b6a2f2ab2..4677085cc 100644 --- a/examples/ipv6/native-border-router/border-router.h +++ b/examples/ipv6/native-border-router/border-router.h @@ -34,8 +34,8 @@ * Joakim Eriksson */ -#ifndef __BORDER_ROUTER_H__ -#define __BORDER_ROUTER_H__ +#ifndef BORDER_ROUTER_H_ +#define BORDER_ROUTER_H_ #include "contiki.h" #include "net/uip.h" @@ -56,4 +56,4 @@ int slip_init(void); int slip_set_fd(int maxfd, fd_set *rset, fd_set *wset); void slip_handle_fd(fd_set *rset, fd_set *wset); -#endif /* __BORDER_ROUTER_H__ */ +#endif /* BORDER_ROUTER_H_ */ diff --git a/examples/ipv6/native-border-router/httpd-simple.h b/examples/ipv6/native-border-router/httpd-simple.h index 4a2efa30f..a16dbd99e 100644 --- a/examples/ipv6/native-border-router/httpd-simple.h +++ b/examples/ipv6/native-border-router/httpd-simple.h @@ -37,8 +37,8 @@ * Joakim Eriksson */ -#ifndef __HTTPD_SIMPLE_H__ -#define __HTTPD_SIMPLE_H__ +#ifndef HTTPD_SIMPLE_H_ +#define HTTPD_SIMPLE_H_ #include "contiki-net.h" @@ -71,4 +71,4 @@ httpd_simple_script_t httpd_simple_get_script(const char *name); #define SEND_STRING(s, str) PSOCK_SEND(s, (uint8_t *)str, strlen(str)) -#endif /* __HTTPD_SIMPLE_H__ */ +#endif /* HTTPD_SIMPLE_H_ */ diff --git a/examples/ipv6/native-border-router/project-conf.h b/examples/ipv6/native-border-router/project-conf.h index 494264b58..4ef217fcb 100644 --- a/examples/ipv6/native-border-router/project-conf.h +++ b/examples/ipv6/native-border-router/project-conf.h @@ -27,8 +27,8 @@ * SUCH DAMAGE. */ -#ifndef __PROJECT_ROUTER_CONF_H__ -#define __PROJECT_ROUTER_CONF_H__ +#ifndef PROJECT_ROUTER_CONF_H_ +#define PROJECT_ROUTER_CONF_H_ #undef UIP_FALLBACK_INTERFACE #define UIP_FALLBACK_INTERFACE rpl_interface @@ -57,4 +57,4 @@ /* used by wpcap (see /cpu/native/net/wpcap-drv.c) */ #define SELECT_CALLBACK 1 -#endif /* __PROJECT_ROUTER_CONF_H__ */ +#endif /* PROJECT_ROUTER_CONF_H_ */ diff --git a/examples/ipv6/rpl-border-router/httpd-simple.h b/examples/ipv6/rpl-border-router/httpd-simple.h index 4a2efa30f..a16dbd99e 100644 --- a/examples/ipv6/rpl-border-router/httpd-simple.h +++ b/examples/ipv6/rpl-border-router/httpd-simple.h @@ -37,8 +37,8 @@ * Joakim Eriksson */ -#ifndef __HTTPD_SIMPLE_H__ -#define __HTTPD_SIMPLE_H__ +#ifndef HTTPD_SIMPLE_H_ +#define HTTPD_SIMPLE_H_ #include "contiki-net.h" @@ -71,4 +71,4 @@ httpd_simple_script_t httpd_simple_get_script(const char *name); #define SEND_STRING(s, str) PSOCK_SEND(s, (uint8_t *)str, strlen(str)) -#endif /* __HTTPD_SIMPLE_H__ */ +#endif /* HTTPD_SIMPLE_H_ */ diff --git a/examples/ipv6/rpl-border-router/project-conf.h b/examples/ipv6/rpl-border-router/project-conf.h index e928a759f..9d9116795 100644 --- a/examples/ipv6/rpl-border-router/project-conf.h +++ b/examples/ipv6/rpl-border-router/project-conf.h @@ -28,8 +28,8 @@ * */ -#ifndef __PROJECT_ROUTER_CONF_H__ -#define __PROJECT_ROUTER_CONF_H__ +#ifndef PROJECT_ROUTER_CONF_H_ +#define PROJECT_ROUTER_CONF_H_ #ifndef UIP_FALLBACK_INTERFACE #define UIP_FALLBACK_INTERFACE rpl_interface @@ -51,4 +51,4 @@ #define WEBSERVER_CONF_CFS_CONNS 2 #endif -#endif /* __PROJECT_ROUTER_CONF_H__ */ +#endif /* PROJECT_ROUTER_CONF_H_ */ diff --git a/examples/ipv6/rpl-collect/collect-common.h b/examples/ipv6/rpl-collect/collect-common.h index 32019d4cd..2c5eff394 100644 --- a/examples/ipv6/rpl-collect/collect-common.h +++ b/examples/ipv6/rpl-collect/collect-common.h @@ -35,8 +35,8 @@ * Niclas Finne */ -#ifndef __COLLECT_COMMON_H__ -#define __COLLECT_COMMON_H__ +#ifndef COLLECT_COMMON_H_ +#define COLLECT_COMMON_H_ #include "contiki.h" #include "net/rime/rimeaddr.h" @@ -53,4 +53,4 @@ void collect_common_set_send_active(int active); PROCESS_NAME(collect_common_process); -#endif /* __COLLECT_COMMON_H__ */ +#endif /* COLLECT_COMMON_H_ */ diff --git a/examples/ipv6/sky-websense/project-conf.h b/examples/ipv6/sky-websense/project-conf.h index 9fbc20686..87834d860 100644 --- a/examples/ipv6/sky-websense/project-conf.h +++ b/examples/ipv6/sky-websense/project-conf.h @@ -28,8 +28,8 @@ * */ -#ifndef __PROJECT_RPL_WEB_CONF_H__ -#define __PROJECT_RPL_WEB_CONF_H__ +#ifndef PROJECT_RPL_WEB_CONF_H_ +#define PROJECT_RPL_WEB_CONF_H_ #undef QUEUEBUF_CONF_NUM #define QUEUEBUF_CONF_NUM 5 @@ -47,4 +47,4 @@ #undef WEBSERVER_CONF_CFS_PATHLEN #define WEBSERVER_CONF_CFS_PATHLEN 80 -#endif /* __PROJECT_RPL_WEB_CONF_H__ */ +#endif /* PROJECT_RPL_WEB_CONF_H_ */ diff --git a/examples/ipv6/sky-websense/wget.h b/examples/ipv6/sky-websense/wget.h index 12e8fbc72..b87f69692 100644 --- a/examples/ipv6/sky-websense/wget.h +++ b/examples/ipv6/sky-websense/wget.h @@ -36,8 +36,8 @@ * Joakim Eriksson */ -#ifndef __WGET_H__ -#define __WGET_H__ +#ifndef WGET_H_ +#define WGET_H_ #include "contiki.h" @@ -59,4 +59,4 @@ enum { WGET_CLOSED }; -#endif /* __WGET_H__ */ +#endif /* WGET_H_ */ diff --git a/examples/ipv6/slip-radio/project-conf.h b/examples/ipv6/slip-radio/project-conf.h index 89ce426d1..965311e04 100644 --- a/examples/ipv6/slip-radio/project-conf.h +++ b/examples/ipv6/slip-radio/project-conf.h @@ -27,8 +27,8 @@ * SUCH DAMAGE. */ -#ifndef __PROJECT_CONF_H__ -#define __PROJECT_CONF_H__ +#ifndef PROJECT_CONF_H_ +#define PROJECT_CONF_H_ #undef QUEUEBUF_CONF_NUM #define QUEUEBUF_CONF_NUM 4 @@ -73,4 +73,4 @@ #undef UART1_CONF_RX_WITH_DMA #define UART1_CONF_RX_WITH_DMA 1 -#endif /* __PROJECT_CONF_H__ */ +#endif /* PROJECT_CONF_H_ */ diff --git a/examples/ipv6/slip-radio/slip-radio.h b/examples/ipv6/slip-radio/slip-radio.h index 8aad5da20..a80e81c4f 100644 --- a/examples/ipv6/slip-radio/slip-radio.h +++ b/examples/ipv6/slip-radio/slip-radio.h @@ -28,8 +28,8 @@ * */ -#ifndef __SLIP_RADIO_H__ -#define __SLIP_RADIO_H__ +#ifndef SLIP_RADIO_H_ +#define SLIP_RADIO_H_ struct slip_radio_sensors { /** Initialize the driver */ @@ -38,4 +38,4 @@ struct slip_radio_sensors { void (* send)(void); }; -#endif /* __SLIP_RADIO_H__ */ +#endif /* SLIP_RADIO_H_ */ diff --git a/examples/mbxxx/mbxxx-websense/project-conf.h b/examples/mbxxx/mbxxx-websense/project-conf.h index ff0ef145d..c3bee71ea 100644 --- a/examples/mbxxx/mbxxx-websense/project-conf.h +++ b/examples/mbxxx/mbxxx-websense/project-conf.h @@ -28,8 +28,8 @@ * */ -#ifndef __PROJECT_RPL_WEB_CONF_H__ -#define __PROJECT_RPL_WEB_CONF_H__ +#ifndef PROJECT_RPL_WEB_CONF_H_ +#define PROJECT_RPL_WEB_CONF_H_ #undef QUEUEBUF_CONF_NUM #define QUEUEBUF_CONF_NUM 2 @@ -46,4 +46,4 @@ #undef WITH_SERIAL_LINE_INPUT #define WITH_SERIAL_LINE_INPUT 0 -#endif /* __PROJECT_RPL_WEB_CONF_H__ */ +#endif /* PROJECT_RPL_WEB_CONF_H_ */ diff --git a/examples/mbxxx/webserver-ajax/webserver-ajax-conf.h b/examples/mbxxx/webserver-ajax/webserver-ajax-conf.h index f51049438..8b03c372f 100644 --- a/examples/mbxxx/webserver-ajax/webserver-ajax-conf.h +++ b/examples/mbxxx/webserver-ajax/webserver-ajax-conf.h @@ -1,7 +1,7 @@ -#ifndef __WEBSERVER_AJAX_CONF_H__ -#define __WEBSERVER_AJAX_CONF_H__ +#ifndef WEBSERVER_AJAX_CONF_H_ +#define WEBSERVER_AJAX_CONF_H_ #undef WITH_RIME #define WITH_RIME 1 @@ -21,4 +21,4 @@ #define UIP_CONF_UDP_CHECKSUMS 1 -#endif /* __WEBSERVER_AJAX_CONF_H__ */ +#endif /* WEBSERVER_AJAX_CONF_H_ */ diff --git a/examples/rest-example/project-conf.h b/examples/rest-example/project-conf.h index e55e28419..ca93a92ec 100644 --- a/examples/rest-example/project-conf.h +++ b/examples/rest-example/project-conf.h @@ -29,8 +29,8 @@ * */ -#ifndef __PROJECT_RPL_WEB_CONF_H__ -#define __PROJECT_RPL_WEB_CONF_H__ +#ifndef PROJECT_RPL_WEB_CONF_H_ +#define PROJECT_RPL_WEB_CONF_H_ #ifndef QUEUEBUF_CONF_NUM #define QUEUEBUF_CONF_NUM 6 @@ -48,4 +48,4 @@ #define WEBSERVER_CONF_CFS_CONNS 2 #endif -#endif /* __PROJECT_RPL_WEB_CONF_H__ */ +#endif /* PROJECT_RPL_WEB_CONF_H_ */ diff --git a/examples/seedeye/powerswitch/project-conf.h b/examples/seedeye/powerswitch/project-conf.h index 0d0b87eb5..208f6111b 100644 --- a/examples/seedeye/powerswitch/project-conf.h +++ b/examples/seedeye/powerswitch/project-conf.h @@ -29,8 +29,8 @@ * */ -#ifndef __PROJECT_RPL_WEB_CONF_H__ -#define __PROJECT_RPL_WEB_CONF_H__ +#ifndef PROJECT_RPL_WEB_CONF_H_ +#define PROJECT_RPL_WEB_CONF_H_ #define SICSLOWPAN_CONF_FRAG 1 @@ -49,4 +49,4 @@ #define COAP_MAX_OBSERVERS COAP_MAX_OPEN_TRANSACTIONS-1 #endif -#endif /* __PROJECT_RPL_WEB_CONF_H__ */ +#endif /* PROJECT_RPL_WEB_CONF_H_ */ diff --git a/examples/udp-stream/project-conf.h b/examples/udp-stream/project-conf.h index d65e2d486..cab313d21 100644 --- a/examples/udp-stream/project-conf.h +++ b/examples/udp-stream/project-conf.h @@ -28,8 +28,8 @@ * */ -#ifndef __PROJECT_H__ -#define __PROJECT_H__ +#ifndef PROJECT_H_ +#define PROJECT_H_ /* Free some code and RAM space */ #define UIP_CONF_TCP 0 @@ -49,4 +49,4 @@ /* Set a large (1 sector) default size for coffee files. */ #define COFFEE_CONF_DYN_SIZE (COFFEE_SECTOR_SIZE - COFFEE_PAGE_SIZE + 1) -#endif /* __PROJECT_H__ */ +#endif /* PROJECT_H_ */ diff --git a/examples/z1/ipv6/z1-websense/project-conf.h b/examples/z1/ipv6/z1-websense/project-conf.h index 72f9fa25c..b0c7166c7 100644 --- a/examples/z1/ipv6/z1-websense/project-conf.h +++ b/examples/z1/ipv6/z1-websense/project-conf.h @@ -28,8 +28,8 @@ * */ -#ifndef __PROJECT_RPL_WEB_CONF_H__ -#define __PROJECT_RPL_WEB_CONF_H__ +#ifndef PROJECT_RPL_WEB_CONF_H_ +#define PROJECT_RPL_WEB_CONF_H_ #undef QUEUEBUF_CONF_NUM #define QUEUEBUF_CONF_NUM 4 @@ -43,4 +43,4 @@ #undef WEBSERVER_CONF_CFS_CONNS #define WEBSERVER_CONF_CFS_CONNS 2 -#endif /* __PROJECT_RPL_WEB_CONF_H__ */ +#endif /* PROJECT_RPL_WEB_CONF_H_ */ diff --git a/examples/z1/ipv6/z1-websense/wget.h b/examples/z1/ipv6/z1-websense/wget.h index 12e8fbc72..b87f69692 100644 --- a/examples/z1/ipv6/z1-websense/wget.h +++ b/examples/z1/ipv6/z1-websense/wget.h @@ -36,8 +36,8 @@ * Joakim Eriksson */ -#ifndef __WGET_H__ -#define __WGET_H__ +#ifndef WGET_H_ +#define WGET_H_ #include "contiki.h" @@ -59,4 +59,4 @@ enum { WGET_CLOSED }; -#endif /* __WGET_H__ */ +#endif /* WGET_H_ */ diff --git a/examples/z1/rssi_scanner/project-conf.h b/examples/z1/rssi_scanner/project-conf.h index 3f7a3e541..8560a4171 100644 --- a/examples/z1/rssi_scanner/project-conf.h +++ b/examples/z1/rssi_scanner/project-conf.h @@ -28,8 +28,8 @@ * */ -#ifndef __PROJECT_CONF_H__ -#define __PROJECT_CONF_H__ +#ifndef PROJECT_CONF_H_ +#define PROJECT_CONF_H_ #undef NETSTACK_CONF_MAC #define NETSTACK_CONF_MAC nullmac_driver @@ -43,4 +43,4 @@ #undef NETSTACK_RDC #define NETSTACK_RDC nullrdc_driver -#endif /* __PROJECT_CONF_H__ */ +#endif /* PROJECT_CONF_H_ */ diff --git a/platform/apple2enh/contiki-conf.h b/platform/apple2enh/contiki-conf.h index e0a026fc7..3f96da1aa 100644 --- a/platform/apple2enh/contiki-conf.h +++ b/platform/apple2enh/contiki-conf.h @@ -32,8 +32,8 @@ * */ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ #include "6502def.h" @@ -65,4 +65,4 @@ #define WWW_CONF_MAX_INPUTNAMELEN 20 #define WWW_CONF_MAX_INPUTVALUELEN 20 -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/platform/atarixl/contiki-conf.h b/platform/atarixl/contiki-conf.h index 4fe341f89..904f9316c 100644 --- a/platform/atarixl/contiki-conf.h +++ b/platform/atarixl/contiki-conf.h @@ -32,8 +32,8 @@ * */ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ #include "6502def.h" @@ -67,4 +67,4 @@ #define WWW_CONF_MAX_INPUTNAMELEN 20 #define WWW_CONF_MAX_INPUTVALUELEN 20 -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cfs.h b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cfs.h index 868c39d03..b4c47c271 100644 --- a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cfs.h +++ b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cfs.h @@ -31,8 +31,8 @@ * */ -#ifndef __HTTPD_CFS_H__ -#define __HTTPD_CFS_H__ +#ifndef HTTPD_CFS_H_ +#define HTTPD_CFS_H_ #include "contiki-net.h" @@ -52,4 +52,4 @@ struct httpd_state { void httpd_init(void); void httpd_appcall(void *state); -#endif /* __HTTPD_CFS_H__ */ +#endif /* HTTPD_CFS_H_ */ diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.h b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.h index acd2f6aed..4b23cb6e7 100644 --- a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.h +++ b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.h @@ -31,8 +31,8 @@ * */ -#ifndef __HTTPD_CGI_H__ -#define __HTTPD_CGI_H__ +#ifndef HTTPD_CGI_H_ +#define HTTPD_CGI_H_ #include "contiki.h" #include "httpd.h" @@ -57,4 +57,4 @@ void web_set_temp(char *s); void web_set_voltage(char *s); uint8_t httpd_cgi_sprint_ip6(uip_ip6addr_t addr, char * result); -#endif /* __HTTPD_CGI_H__ */ +#endif /* HTTPD_CGI_H_ */ diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fs.h b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fs.h index cf354019e..85e004ca6 100644 --- a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fs.h +++ b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fs.h @@ -31,8 +31,8 @@ * Author: Adam Dunkels * */ -#ifndef __HTTPD_FS_H__ -#define __HTTPD_FS_H__ +#ifndef HTTPD_FS_H_ +#define HTTPD_FS_H_ #include "contiki-net.h" @@ -83,4 +83,4 @@ uint16_t httpd_fs_open(const char *name, struct httpd_fs_file *file); #define httpd_fs_getchar(x) pgm_read_byte(x) #endif -#endif /* __HTTPD_FS_H__ */ +#endif /* HTTPD_FS_H_ */ diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fsdata.h b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fsdata.h index 16c0ec48e..45bf3caea 100644 --- a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fsdata.h +++ b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fsdata.h @@ -31,8 +31,8 @@ * Author: Adam Dunkels * */ -#ifndef __HTTPD_FSDATA_H__ -#define __HTTPD_FSDATA_H__ +#ifndef HTTPD_FSDATA_H_ +#define HTTPD_FSDATA_H_ #include "contiki-net.h" @@ -56,4 +56,4 @@ struct httpd_fsdata_file_noconst { #endif /* HTTPD_FS_STATISTICS */ }; -#endif /* __HTTPD_FSDATA_H__ */ +#endif /* HTTPD_FSDATA_H_ */ diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd.h b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd.h index 73842cb0b..3d5df11f2 100644 --- a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd.h +++ b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd.h @@ -31,8 +31,8 @@ * */ -#ifndef __HTTPD_H__ -#define __HTTPD_H__ +#ifndef HTTPD_H_ +#define HTTPD_H_ #include "contiki-net.h" @@ -90,4 +90,4 @@ struct httpd_state { void httpd_init(void); void httpd_appcall(void *state); -#endif /* __HTTPD_H__ */ +#endif /* HTTPD_H_ */ diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-dsc.h b/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-dsc.h index c329f41d8..35aee6e7c 100644 --- a/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-dsc.h +++ b/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-dsc.h @@ -31,11 +31,11 @@ * * */ -#ifndef __WEBSERVER_DSC_H__ -#define __WEBSERVER_DSC_H__ +#ifndef WEBSERVER_DSC_H_ +#define WEBSERVER_DSC_H_ #include "sys/dsc.h" DSC_HEADER(webserver_dsc); -#endif /* __WEBSERVER_DSC_H__ */ +#endif /* WEBSERVER_DSC_H_ */ diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-nogui.h b/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-nogui.h index 825dfb96f..940f1a704 100644 --- a/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-nogui.h +++ b/platform/avr-atmega128rfa1/apps/raven-webserver/webserver-nogui.h @@ -31,8 +31,8 @@ * * */ -#ifndef __WEBSERVER_NOGUI_H__ -#define __WEBSERVER_NOGUI_H__ +#ifndef WEBSERVER_NOGUI_H_ +#define WEBSERVER_NOGUI_H_ #include "contiki-net.h" @@ -42,4 +42,4 @@ PROCESS_NAME(raven_lcd_process); void webserver_log(char *msg); void webserver_log_file(uip_ipaddr_t *requester, char *file); -#endif /* __WEBSERVER_H__ */ +#endif /* WEBSERVER_H_ */ diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/webserver.h b/platform/avr-atmega128rfa1/apps/raven-webserver/webserver.h index fe9f255a1..c96e7a32c 100644 --- a/platform/avr-atmega128rfa1/apps/raven-webserver/webserver.h +++ b/platform/avr-atmega128rfa1/apps/raven-webserver/webserver.h @@ -31,8 +31,8 @@ * * */ -#ifndef __WEBSERVER_H__ -#define __WEBSERVER_H__ +#ifndef WEBSERVER_H_ +#define WEBSERVER_H_ #include "contiki-net.h" @@ -41,4 +41,4 @@ PROCESS_NAME(webserver_process); void webserver_log(char *msg); void webserver_log_file(uip_ipaddr_t *requester, char *file); -#endif /* __WEBSERVER_H__ */ +#endif /* WEBSERVER_H_ */ diff --git a/platform/avr-atmega128rfa1/contiki-conf.h b/platform/avr-atmega128rfa1/contiki-conf.h index ad5fc05c7..fb656a5a7 100644 --- a/platform/avr-atmega128rfa1/contiki-conf.h +++ b/platform/avr-atmega128rfa1/contiki-conf.h @@ -38,8 +38,8 @@ * David Kopf */ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ /* Platform name, type, and MCU clock rate */ #define PLATFORM_NAME "RFA1" @@ -351,4 +351,4 @@ typedef unsigned short uip_stats_t; #include PROJECT_CONF_H #endif -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/platform/avr-atmega128rfa1/params.h b/platform/avr-atmega128rfa1/params.h index 7a5e8aaae..d1888fe3c 100644 --- a/platform/avr-atmega128rfa1/params.h +++ b/platform/avr-atmega128rfa1/params.h @@ -1,5 +1,5 @@ -#ifndef __PARAMS_H__ -#define __PARAMS_H__ +#ifndef PARAMS_H_ +#define PARAMS_H_ /* PARAMETER_STORAGE = * 0 Hard coded, minmal program and eeprom usage. * 1 Stored in fixed eeprom locations, rewritten from flash if corrupt. @@ -105,4 +105,4 @@ uint16_t params_get_panaddr(void); uint8_t params_get_txpower(void); #endif -#endif /* __PARAMS_H__ */ +#endif /* PARAMS_H_ */ diff --git a/platform/avr-raven/apps/raven-webserver/httpd-cfs.h b/platform/avr-raven/apps/raven-webserver/httpd-cfs.h index 868c39d03..b4c47c271 100644 --- a/platform/avr-raven/apps/raven-webserver/httpd-cfs.h +++ b/platform/avr-raven/apps/raven-webserver/httpd-cfs.h @@ -31,8 +31,8 @@ * */ -#ifndef __HTTPD_CFS_H__ -#define __HTTPD_CFS_H__ +#ifndef HTTPD_CFS_H_ +#define HTTPD_CFS_H_ #include "contiki-net.h" @@ -52,4 +52,4 @@ struct httpd_state { void httpd_init(void); void httpd_appcall(void *state); -#endif /* __HTTPD_CFS_H__ */ +#endif /* HTTPD_CFS_H_ */ diff --git a/platform/avr-raven/apps/raven-webserver/httpd-cgi.h b/platform/avr-raven/apps/raven-webserver/httpd-cgi.h index acd2f6aed..4b23cb6e7 100644 --- a/platform/avr-raven/apps/raven-webserver/httpd-cgi.h +++ b/platform/avr-raven/apps/raven-webserver/httpd-cgi.h @@ -31,8 +31,8 @@ * */ -#ifndef __HTTPD_CGI_H__ -#define __HTTPD_CGI_H__ +#ifndef HTTPD_CGI_H_ +#define HTTPD_CGI_H_ #include "contiki.h" #include "httpd.h" @@ -57,4 +57,4 @@ void web_set_temp(char *s); void web_set_voltage(char *s); uint8_t httpd_cgi_sprint_ip6(uip_ip6addr_t addr, char * result); -#endif /* __HTTPD_CGI_H__ */ +#endif /* HTTPD_CGI_H_ */ diff --git a/platform/avr-raven/apps/raven-webserver/httpd-fs.h b/platform/avr-raven/apps/raven-webserver/httpd-fs.h index cf354019e..85e004ca6 100644 --- a/platform/avr-raven/apps/raven-webserver/httpd-fs.h +++ b/platform/avr-raven/apps/raven-webserver/httpd-fs.h @@ -31,8 +31,8 @@ * Author: Adam Dunkels * */ -#ifndef __HTTPD_FS_H__ -#define __HTTPD_FS_H__ +#ifndef HTTPD_FS_H_ +#define HTTPD_FS_H_ #include "contiki-net.h" @@ -83,4 +83,4 @@ uint16_t httpd_fs_open(const char *name, struct httpd_fs_file *file); #define httpd_fs_getchar(x) pgm_read_byte(x) #endif -#endif /* __HTTPD_FS_H__ */ +#endif /* HTTPD_FS_H_ */ diff --git a/platform/avr-raven/apps/raven-webserver/httpd-fsdata.h b/platform/avr-raven/apps/raven-webserver/httpd-fsdata.h index 16c0ec48e..45bf3caea 100644 --- a/platform/avr-raven/apps/raven-webserver/httpd-fsdata.h +++ b/platform/avr-raven/apps/raven-webserver/httpd-fsdata.h @@ -31,8 +31,8 @@ * Author: Adam Dunkels * */ -#ifndef __HTTPD_FSDATA_H__ -#define __HTTPD_FSDATA_H__ +#ifndef HTTPD_FSDATA_H_ +#define HTTPD_FSDATA_H_ #include "contiki-net.h" @@ -56,4 +56,4 @@ struct httpd_fsdata_file_noconst { #endif /* HTTPD_FS_STATISTICS */ }; -#endif /* __HTTPD_FSDATA_H__ */ +#endif /* HTTPD_FSDATA_H_ */ diff --git a/platform/avr-raven/apps/raven-webserver/httpd.h b/platform/avr-raven/apps/raven-webserver/httpd.h index 73842cb0b..3d5df11f2 100644 --- a/platform/avr-raven/apps/raven-webserver/httpd.h +++ b/platform/avr-raven/apps/raven-webserver/httpd.h @@ -31,8 +31,8 @@ * */ -#ifndef __HTTPD_H__ -#define __HTTPD_H__ +#ifndef HTTPD_H_ +#define HTTPD_H_ #include "contiki-net.h" @@ -90,4 +90,4 @@ struct httpd_state { void httpd_init(void); void httpd_appcall(void *state); -#endif /* __HTTPD_H__ */ +#endif /* HTTPD_H_ */ diff --git a/platform/avr-raven/apps/raven-webserver/webserver-dsc.h b/platform/avr-raven/apps/raven-webserver/webserver-dsc.h index c329f41d8..35aee6e7c 100644 --- a/platform/avr-raven/apps/raven-webserver/webserver-dsc.h +++ b/platform/avr-raven/apps/raven-webserver/webserver-dsc.h @@ -31,11 +31,11 @@ * * */ -#ifndef __WEBSERVER_DSC_H__ -#define __WEBSERVER_DSC_H__ +#ifndef WEBSERVER_DSC_H_ +#define WEBSERVER_DSC_H_ #include "sys/dsc.h" DSC_HEADER(webserver_dsc); -#endif /* __WEBSERVER_DSC_H__ */ +#endif /* WEBSERVER_DSC_H_ */ diff --git a/platform/avr-raven/apps/raven-webserver/webserver-nogui.h b/platform/avr-raven/apps/raven-webserver/webserver-nogui.h index 825dfb96f..940f1a704 100644 --- a/platform/avr-raven/apps/raven-webserver/webserver-nogui.h +++ b/platform/avr-raven/apps/raven-webserver/webserver-nogui.h @@ -31,8 +31,8 @@ * * */ -#ifndef __WEBSERVER_NOGUI_H__ -#define __WEBSERVER_NOGUI_H__ +#ifndef WEBSERVER_NOGUI_H_ +#define WEBSERVER_NOGUI_H_ #include "contiki-net.h" @@ -42,4 +42,4 @@ PROCESS_NAME(raven_lcd_process); void webserver_log(char *msg); void webserver_log_file(uip_ipaddr_t *requester, char *file); -#endif /* __WEBSERVER_H__ */ +#endif /* WEBSERVER_H_ */ diff --git a/platform/avr-raven/apps/raven-webserver/webserver.h b/platform/avr-raven/apps/raven-webserver/webserver.h index fe9f255a1..c96e7a32c 100644 --- a/platform/avr-raven/apps/raven-webserver/webserver.h +++ b/platform/avr-raven/apps/raven-webserver/webserver.h @@ -31,8 +31,8 @@ * * */ -#ifndef __WEBSERVER_H__ -#define __WEBSERVER_H__ +#ifndef WEBSERVER_H_ +#define WEBSERVER_H_ #include "contiki-net.h" @@ -41,4 +41,4 @@ PROCESS_NAME(webserver_process); void webserver_log(char *msg); void webserver_log_file(uip_ipaddr_t *requester, char *file); -#endif /* __WEBSERVER_H__ */ +#endif /* WEBSERVER_H_ */ diff --git a/platform/avr-raven/contiki-conf.h b/platform/avr-raven/contiki-conf.h index 1ec239c18..ac9490c1c 100644 --- a/platform/avr-raven/contiki-conf.h +++ b/platform/avr-raven/contiki-conf.h @@ -40,8 +40,8 @@ * David Kopf */ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ /* Platform name, type, and MCU clock rate */ #define PLATFORM_NAME "Raven" @@ -366,4 +366,4 @@ typedef unsigned short uip_stats_t; #include PROJECT_CONF_H #endif /* PROJECT_CONF_H */ -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/platform/avr-raven/contiki-raven.h b/platform/avr-raven/contiki-raven.h index eb37e0f26..f812ceede 100644 --- a/platform/avr-raven/contiki-raven.h +++ b/platform/avr-raven/contiki-raven.h @@ -39,8 +39,8 @@ * Simon Barner #include @@ -106,5 +106,5 @@ void adc_deinit(void); int adc_conversion_start(void); int16_t adc_result_get(adc_adj_t adjust); -#endif /* __ADC_H__ */ +#endif /* ADC_H_ */ diff --git a/platform/avr-ravenlcd/key.h b/platform/avr-ravenlcd/key.h index 24285e970..eefeefe6d 100644 --- a/platform/avr-ravenlcd/key.h +++ b/platform/avr-ravenlcd/key.h @@ -38,8 +38,8 @@ * */ -#ifndef __KEY_H__ -#define __KEY_H__ +#ifndef KEY_H_ +#define KEY_H_ #include #include @@ -93,4 +93,4 @@ key_state_t key_state_get(void); uint8_t is_button(void); uint8_t get_button(void); -#endif /* __KEY_H__ */ +#endif /* KEY_H_ */ diff --git a/platform/avr-ravenlcd/lcd.h b/platform/avr-ravenlcd/lcd.h index b14d5827c..a1eaa6a78 100644 --- a/platform/avr-ravenlcd/lcd.h +++ b/platform/avr-ravenlcd/lcd.h @@ -38,8 +38,8 @@ * */ -#ifndef __LCD_H__ -#define __LCD_H__ +#ifndef LCD_H_ +#define LCD_H_ #include #include @@ -347,5 +347,5 @@ void led_on(void); void led_off(void); /** @} */ -#endif /* __LCD_H__ */ +#endif /* LCD_H_ */ diff --git a/platform/avr-ravenlcd/main.h b/platform/avr-ravenlcd/main.h index e41ec464f..74256a500 100644 --- a/platform/avr-ravenlcd/main.h +++ b/platform/avr-ravenlcd/main.h @@ -39,8 +39,8 @@ * */ -#ifndef __MAIN_H__ -#define __MAIN_H__ +#ifndef MAIN_H_ +#define MAIN_H_ /** \name Logical defines */ /** \{ */ @@ -70,4 +70,4 @@ /** \} */ -#endif /* __MAIN_H__ */ +#endif /* MAIN_H_ */ diff --git a/platform/avr-ravenlcd/sleep.h b/platform/avr-ravenlcd/sleep.h index b020338b0..19a10c828 100644 --- a/platform/avr-ravenlcd/sleep.h +++ b/platform/avr-ravenlcd/sleep.h @@ -38,11 +38,11 @@ * */ -#ifndef __SLEEP_H__ -#define __SLEEP_H__ +#ifndef SLEEP_H_ +#define SLEEP_H_ /* Prototypes */ void sleep_now(int howlong); void sleep_wakeup(void); -#endif /* __SLEEP_H__ */ +#endif /* SLEEP_H_ */ diff --git a/platform/avr-ravenlcd/temp.h b/platform/avr-ravenlcd/temp.h index 798de558c..d0d50caa0 100644 --- a/platform/avr-ravenlcd/temp.h +++ b/platform/avr-ravenlcd/temp.h @@ -38,8 +38,8 @@ * */ -#ifndef __TEMP_H__ -#define __TEMP_H__ +#ifndef TEMP_H_ +#define TEMP_H_ #include @@ -90,4 +90,4 @@ void temp_deinit(void); */ int16_t temp_get(temp_unit_t unit); /** \} */ -#endif /* __TEMP_H__ */ +#endif /* TEMP_H_ */ diff --git a/platform/avr-ravenlcd/uart.h b/platform/avr-ravenlcd/uart.h index 060181d66..6024324f6 100644 --- a/platform/avr-ravenlcd/uart.h +++ b/platform/avr-ravenlcd/uart.h @@ -39,8 +39,8 @@ * */ -#ifndef __UART_H__ -#define __UART_H__ 1 +#ifndef UART_H_ +#define UART_H_ 1 #include @@ -75,4 +75,4 @@ void uart_send_byte(uint8_t byte); void uart_serial_send_frame(uint8_t cmd, uint8_t payload_length, uint8_t *payload); void uart_serial_rcv_frame(uint8_t wait_for_it); -#endif /* __UART_H__ */ +#endif /* UART_H_ */ diff --git a/platform/avr-ravenusb/cdc_task.h b/platform/avr-ravenusb/cdc_task.h index 66042b49d..b88a01a60 100644 --- a/platform/avr-ravenusb/cdc_task.h +++ b/platform/avr-ravenusb/cdc_task.h @@ -40,8 +40,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _CDC_TASK_H_ -#define _CDC_TASK_H_ +#ifndef CDC_TASK_H_ +#define CDC_TASK_H_ /** \addtogroup cdctask @@ -70,5 +70,5 @@ PROCESS_NAME(cdc_process); /** @} */ -#endif /* _CDC_TASK_H_ */ +#endif /*CDC_TASK_H_ */ diff --git a/platform/avr-ravenusb/contiki-conf.h b/platform/avr-ravenusb/contiki-conf.h index 459fc58e1..8b0a5d0a3 100644 --- a/platform/avr-ravenusb/contiki-conf.h +++ b/platform/avr-ravenusb/contiki-conf.h @@ -40,8 +40,8 @@ * David Kopf */ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ /* ************************************************************************** */ //#pragma mark Basic Configuration @@ -483,4 +483,4 @@ typedef unsigned short uip_stats_t; #define CCIF #define CLIF -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/platform/avr-ravenusb/contiki-raven.h b/platform/avr-ravenusb/contiki-raven.h index d93ae17fc..91a806d61 100644 --- a/platform/avr-ravenusb/contiki-raven.h +++ b/platform/avr-ravenusb/contiki-raven.h @@ -36,8 +36,8 @@ * */ -#ifndef __CONTIKI_RAVEN_H__ -#define __CONTIKI_RAVEN_H__ +#ifndef CONTIKI_RAVEN_H_ +#define CONTIKI_RAVEN_H_ #include "contiki.h" #include "contiki-net.h" @@ -65,4 +65,4 @@ void init_lowlevel(void); void init_net(void); -#endif /* #ifndef __CONTIKI_RAVEN_H__ */ +#endif /* #ifndef CONTIKI_RAVEN_H_ */ diff --git a/platform/avr-ravenusb/rng.h b/platform/avr-ravenusb/rng.h index 4c66d9a72..161953c27 100644 --- a/platform/avr-ravenusb/rng.h +++ b/platform/avr-ravenusb/rng.h @@ -1,5 +1,5 @@ -#ifndef __AVR_RNG_H__ -#define __AVR_RNG_H__ +#ifndef AVR_RNG_H_ +#define AVR_RNG_H_ #include diff --git a/platform/avr-rcb/contiki-conf.h b/platform/avr-rcb/contiki-conf.h index e8170bdd9..a5c1a6118 100644 --- a/platform/avr-rcb/contiki-conf.h +++ b/platform/avr-rcb/contiki-conf.h @@ -39,8 +39,8 @@ * Simon Barner @@ -144,4 +144,4 @@ typedef unsigned long u32_t; typedef unsigned short uip_stats_t; typedef unsigned long off_t; -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/platform/avr-rcb/contiki-rcb.h b/platform/avr-rcb/contiki-rcb.h index eb37e0f26..f812ceede 100644 --- a/platform/avr-rcb/contiki-rcb.h +++ b/platform/avr-rcb/contiki-rcb.h @@ -39,8 +39,8 @@ * Simon Barner */ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ /* Platform name, type, and MCU clock rate */ #define PLATFORM_NAME "Zigbit" @@ -179,4 +179,4 @@ typedef unsigned short uip_stats_t; typedef unsigned long off_t; -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/platform/c128/contiki-conf.h b/platform/c128/contiki-conf.h index 56b4d09a8..8aabcca03 100644 --- a/platform/c128/contiki-conf.h +++ b/platform/c128/contiki-conf.h @@ -32,8 +32,8 @@ * */ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ #include "6502def.h" @@ -72,4 +72,4 @@ #define WWW_CONF_MAX_NUMPAGEWIDGETS 20 #define WWW_CONF_FORMS 0 -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/platform/c64/contiki-conf.h b/platform/c64/contiki-conf.h index 354d2eaa9..2fddafdc1 100644 --- a/platform/c64/contiki-conf.h +++ b/platform/c64/contiki-conf.h @@ -32,8 +32,8 @@ * */ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ #include "6502def.h" @@ -75,4 +75,4 @@ #define WWW_CONF_MAX_INPUTNAMELEN 20 #define WWW_CONF_MAX_INPUTVALUELEN 20 -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/platform/cc2530dk/contiki-conf.h b/platform/cc2530dk/contiki-conf.h index 313fd669f..f5efa0e69 100644 --- a/platform/cc2530dk/contiki-conf.h +++ b/platform/cc2530dk/contiki-conf.h @@ -1,5 +1,5 @@ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ #include "8051def.h" #include "sys/cc.h" @@ -280,4 +280,4 @@ #define UIP_CONF_DS6_AADDR_NBU 1 #endif -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/platform/cc2530dk/debug.h b/platform/cc2530dk/debug.h index d72fb006b..94eaa4f51 100644 --- a/platform/cc2530dk/debug.h +++ b/platform/cc2530dk/debug.h @@ -40,8 +40,8 @@ * George Oikonomou - */ -#ifndef __DEBUG_H__ -#define __DEBUG_H__ +#ifndef DEBUG_H_ +#define DEBUG_H_ #include "8051def.h" #include "dev/uart1.h" @@ -52,4 +52,4 @@ void puthex(uint8_t c); void putbin(uint8_t c); void putdec(uint8_t c); -#endif /* __DEBUG_H__ */ +#endif /* DEBUG_H_ */ diff --git a/platform/cc2530dk/dev/adc-sensor.h b/platform/cc2530dk/dev/adc-sensor.h index 45b0a9985..bb6c6580f 100644 --- a/platform/cc2530dk/dev/adc-sensor.h +++ b/platform/cc2530dk/dev/adc-sensor.h @@ -40,8 +40,8 @@ * George Oikonomou - */ -#ifndef __ADC_SENSOR_H__ -#define __ADC_SENSOR_H__ +#ifndef ADC_SENSOR_H_ +#define ADC_SENSOR_H_ #include "cc253x.h" #include "contiki-conf.h" @@ -79,4 +79,4 @@ extern const struct sensors_sensor adc_sensor; #define VDD_SENSOR_ON VDD_SENSOR_CONF_ON #endif /* VDD_SENSOR_CONF_ON */ -#endif /* __ADC_SENSOR_H__ */ +#endif /* ADC_SENSOR_H_ */ diff --git a/platform/cc2530dk/dev/button-sensor.h b/platform/cc2530dk/dev/button-sensor.h index 82cd2ec17..79001e960 100644 --- a/platform/cc2530dk/dev/button-sensor.h +++ b/platform/cc2530dk/dev/button-sensor.h @@ -37,8 +37,8 @@ * George Oikonomou - */ -#ifndef __BUTTON_SENSOR_H__ -#define __BUTTON_SENSOR_H__ +#ifndef BUTTON_SENSOR_H_ +#define BUTTON_SENSOR_H_ #include "contiki-conf.h" #include "lib/sensors.h" @@ -105,4 +105,4 @@ void port_0_isr(void) __interrupt(P0INT_VECTOR); #define BUTTON_IRQ_ON_PRESS(b) PORT_IRQ_EDGE_RISE(BUTTON##b##_PORT, BUTTON##b##_PIN) #define BUTTON_IRQ_ON_RELEASE(b) PORT_IRQ_EDGE_FALL(BUTTON##b##_PORT, BUTTON##b##_PIN) -#endif /* __BUTTON_SENSOR_H__ */ +#endif /* BUTTON_SENSOR_H_ */ diff --git a/platform/cc2530dk/dev/leds-arch.h b/platform/cc2530dk/dev/leds-arch.h index b19d5cf9d..0e0f9b565 100644 --- a/platform/cc2530dk/dev/leds-arch.h +++ b/platform/cc2530dk/dev/leds-arch.h @@ -38,8 +38,8 @@ */ -#ifndef __LEDS_ARCH_H__ -#define __LEDS_ARCH_H__ +#ifndef LEDS_ARCH_H_ +#define LEDS_ARCH_H_ #include "dev/port.h" @@ -50,4 +50,4 @@ #define LED4_DIR_INPUT() PORT_DIR_INPUT(LED4_PORT, LED4_PIN) #define LED4_DIR_OUTPUT() PORT_DIR_OUTPUT(LED4_PORT, LED4_PIN) -#endif /* __LEDS_ARCH_H__ */ +#endif /* LEDS_ARCH_H_ */ diff --git a/platform/cc2530dk/models.h b/platform/cc2530dk/models.h index 23989915c..fe396d9f5 100644 --- a/platform/cc2530dk/models.h +++ b/platform/cc2530dk/models.h @@ -41,8 +41,8 @@ * George Oikonomou - */ -#ifndef __MODELS_H__ -#define __MODELS_H__ +#ifndef MODELS_H_ +#define MODELS_H_ /*---------------------------------------------------------------------------*/ /* LEDs */ @@ -116,4 +116,4 @@ /* Buttons */ /*---------------------------------------------------------------------------*/ -#endif /* __MODELS_H__ */ +#endif /* MODELS_H_ */ diff --git a/platform/cooja/contiki-conf.h b/platform/cooja/contiki-conf.h index 217432c18..46341dae4 100644 --- a/platform/cooja/contiki-conf.h +++ b/platform/cooja/contiki-conf.h @@ -30,8 +30,8 @@ * */ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ #define PROFILE_CONF_ON 0 #define ENERGEST_CONF_ON 0 @@ -243,4 +243,4 @@ typedef unsigned long rtimer_clock_t; #include PROJECT_CONF_H #endif /* PROJECT_CONF_H */ -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/platform/cooja/dev/beep.h b/platform/cooja/dev/beep.h index 31647b9a1..d228fc613 100644 --- a/platform/cooja/dev/beep.h +++ b/platform/cooja/dev/beep.h @@ -28,8 +28,8 @@ * */ -#ifndef __BEEP_H__ -#define __BEEP_H__ +#ifndef BEEP_H_ +#define BEEP_H_ #include "sys/clock.h" @@ -57,4 +57,4 @@ void beep_long(clock_time_t len); void beep_quick(int num); -#endif /* __BEEP_H__ */ +#endif /* BEEP_H_ */ diff --git a/platform/cooja/dev/button-sensor.h b/platform/cooja/dev/button-sensor.h index 11d0cbcbb..1f1fb0fbc 100644 --- a/platform/cooja/dev/button-sensor.h +++ b/platform/cooja/dev/button-sensor.h @@ -28,8 +28,8 @@ * */ -#ifndef __BUTTON_SENSOR_H__ -#define __BUTTON_SENSOR_H__ +#ifndef BUTTON_SENSOR_H_ +#define BUTTON_SENSOR_H_ #include "lib/sensors.h" @@ -37,4 +37,4 @@ extern const struct sensors_sensor button_sensor; #define BUTTON_SENSOR "Button" -#endif /* __BUTTON_SENSOR_H__ */ +#endif /* BUTTON_SENSOR_H_ */ diff --git a/platform/cooja/dev/cooja-radio.h b/platform/cooja/dev/cooja-radio.h index 40873c9cb..b6bfb3aaf 100644 --- a/platform/cooja/dev/cooja-radio.h +++ b/platform/cooja/dev/cooja-radio.h @@ -30,8 +30,8 @@ * */ -#ifndef __COOJA_RADIO_H__ -#define __COOJA_RADIO_H__ +#ifndef COOJA_RADIO_H_ +#define COOJA_RADIO_H_ #include "contiki.h" #include "dev/radio.h" @@ -71,4 +71,4 @@ int radio_LQI(void); -#endif /* __COOJA_RADIO_H__ */ +#endif /* COOJA_RADIO_H_ */ diff --git a/platform/cooja/dev/ip.h b/platform/cooja/dev/ip.h index 8a03223fc..57ff9c046 100644 --- a/platform/cooja/dev/ip.h +++ b/platform/cooja/dev/ip.h @@ -28,7 +28,7 @@ * */ -#ifndef __IP_H__ -#define __IP_H__ +#ifndef IP_H_ +#define IP_H_ -#endif /* __IP_H__ */ +#endif /* IP_H_ */ diff --git a/platform/cooja/dev/moteid.h b/platform/cooja/dev/moteid.h index 95def929a..18aada16d 100644 --- a/platform/cooja/dev/moteid.h +++ b/platform/cooja/dev/moteid.h @@ -28,9 +28,9 @@ * */ -#ifndef __MOTEID_H__ -#define __MOTEID_H__ +#ifndef MOTEID_H_ +#define MOTEID_H_ extern int simMoteID; -#endif /* __MOTEID_H__ */ +#endif /* MOTEID_H_ */ diff --git a/platform/cooja/dev/pir-sensor.h b/platform/cooja/dev/pir-sensor.h index a88fd7849..aa2c1eef4 100644 --- a/platform/cooja/dev/pir-sensor.h +++ b/platform/cooja/dev/pir-sensor.h @@ -28,8 +28,8 @@ * */ -#ifndef __PIR_H__ -#define __PIR_H__ +#ifndef PIR_H_ +#define PIR_H_ #include "lib/sensors.h" @@ -37,4 +37,4 @@ extern const struct sensors_sensor pir_sensor; #define PIR_SENSOR "PIR" -#endif /* __PIR_H__ */ +#endif /* PIR_H_ */ diff --git a/platform/cooja/dev/rs232.h b/platform/cooja/dev/rs232.h index 0c52fc355..aefb5c823 100644 --- a/platform/cooja/dev/rs232.h +++ b/platform/cooja/dev/rs232.h @@ -45,8 +45,8 @@ * \author Adam Dunkels * */ -#ifndef __RS232_H__ -#define __RS232_H__ +#ifndef RS232_H_ +#define RS232_H_ #define RS232_19200 1 @@ -112,6 +112,6 @@ void rs232_print(char *text); */ void rs232_send(char c); -#endif /* __RS232_H__ */ +#endif /* RS232_H_ */ /** @} */ /** @} */ diff --git a/platform/cooja/dev/vib-sensor.h b/platform/cooja/dev/vib-sensor.h index 79acf5dff..bd12097c9 100644 --- a/platform/cooja/dev/vib-sensor.h +++ b/platform/cooja/dev/vib-sensor.h @@ -28,8 +28,8 @@ * */ -#ifndef __VIB_H__ -#define __VIB_H__ +#ifndef VIB_H_ +#define VIB_H_ #include "lib/sensors.h" @@ -37,4 +37,4 @@ extern const struct sensors_sensor vib_sensor; #define VIB_SENSOR "Vibration" -#endif /* __VIB_H__ */ +#endif /* VIB_H_ */ diff --git a/platform/cooja/lib/simEnvChange.h b/platform/cooja/lib/simEnvChange.h index b9f700d71..35189a42d 100644 --- a/platform/cooja/lib/simEnvChange.h +++ b/platform/cooja/lib/simEnvChange.h @@ -28,8 +28,8 @@ * */ -#ifndef __SIMENVCHANGE_H__ -#define __SIMENVCHANGE_H__ +#ifndef SIMENVCHANGE_H_ +#define SIMENVCHANGE_H_ #include "contiki.h" @@ -64,4 +64,4 @@ const struct simInterface *simInterfaces[] = {__VA_ARGS__, NULL}; void doActionsBeforeTick(); void doActionsAfterTick(); -#endif /* __SIMENVCHANGE_H__ */ +#endif /* SIMENVCHANGE_H_ */ diff --git a/platform/cooja/mtarch.h b/platform/cooja/mtarch.h index 04e6817a4..1244f9a4a 100644 --- a/platform/cooja/mtarch.h +++ b/platform/cooja/mtarch.h @@ -30,11 +30,11 @@ * */ -#ifndef __MTARCH_H__ -#define __MTARCH_H__ +#ifndef MTARCH_H_ +#define MTARCH_H_ struct mtarch_thread { void *mt_thread; }; -#endif /* __MTARCH_H__ */ +#endif /* MTARCH_H_ */ diff --git a/platform/cooja/net/init-net.h b/platform/cooja/net/init-net.h index 8b67708f0..1f45b30eb 100644 --- a/platform/cooja/net/init-net.h +++ b/platform/cooja/net/init-net.h @@ -32,10 +32,10 @@ * */ -#ifndef __INIT_NET_H__ -#define __INIT_NET_H__ +#ifndef INIT_NET_H_ +#define INIT_NET_H_ void init_net(void); -#endif /* __INIT_NET_H__ */ +#endif /* INIT_NET_H_ */ diff --git a/platform/cooja/net/radio-uip-uaodv.h b/platform/cooja/net/radio-uip-uaodv.h index c5471365f..e55016608 100644 --- a/platform/cooja/net/radio-uip-uaodv.h +++ b/platform/cooja/net/radio-uip-uaodv.h @@ -30,8 +30,8 @@ * */ -#ifndef __RADIO_UIP_UAODV_H__ -#define __RADIO_UIP_UAODV_H__ +#ifndef RADIO_UIP_UAODV_H_ +#define RADIO_UIP_UAODV_H_ #include "contiki.h" #include "dev/radio.h" @@ -42,4 +42,4 @@ radio_uip_uaodv_init(const struct radio_driver *d); uint8_t radio_uip_uaodv_send(void); -#endif /* __RADIO_UIP_UAODV_H__ */ +#endif /* RADIO_UIP_UAODV_H_ */ diff --git a/platform/cooja/net/uip-driver.h b/platform/cooja/net/uip-driver.h index c067f647b..2a9c4b191 100644 --- a/platform/cooja/net/uip-driver.h +++ b/platform/cooja/net/uip-driver.h @@ -36,8 +36,8 @@ * Joakim Eriksson */ -#ifndef __UIP_DRIVER_H__ -#define __UIP_DRIVER_H__ +#ifndef UIP_DRIVER_H_ +#define UIP_DRIVER_H_ #include "net/netstack.h" @@ -45,4 +45,4 @@ uint8_t uip_driver_send(void); extern const struct network_driver uip_driver; -#endif /* __UIP_DRIVER_H__ */ +#endif /* UIP_DRIVER_H_ */ diff --git a/platform/cooja/rtimer-arch.h b/platform/cooja/rtimer-arch.h index 65acb3856..616ad4185 100644 --- a/platform/cooja/rtimer-arch.h +++ b/platform/cooja/rtimer-arch.h @@ -30,8 +30,8 @@ * */ -#ifndef __RTIMER_ARCH_H__ -#define __RTIMER_ARCH_H__ +#ifndef RTIMER_ARCH_H_ +#define RTIMER_ARCH_H_ #include "contiki-conf.h" #include "sys/clock.h" @@ -43,4 +43,4 @@ int rtimer_arch_check(void); int rtimer_arch_pending(void); rtimer_clock_t rtimer_arch_next(void); -#endif /* __RTIMER_ARCH_H__ */ +#endif /* RTIMER_ARCH_H_ */ diff --git a/platform/cooja/sys/cooja_mt.h b/platform/cooja/sys/cooja_mt.h index 7316b41e3..4707b1fff 100644 --- a/platform/cooja/sys/cooja_mt.h +++ b/platform/cooja/sys/cooja_mt.h @@ -35,8 +35,8 @@ * This file is ripped from mt.h of the Contiki Multi-threading library. * Fredrik Osterlind */ -#ifndef __COOJA_MT_H__ -#define __COOJA_MT_H__ +#ifndef COOJA_MT_H_ +#define COOJA_MT_H_ #include "contiki.h" @@ -248,4 +248,4 @@ void cooja_mt_exit(void); /** @} */ /** @} */ -#endif /* __MT_H__ */ +#endif /* MT_H_ */ diff --git a/platform/cooja/sys/cooja_mtarch.h b/platform/cooja/sys/cooja_mtarch.h index f88a20bae..084962e81 100644 --- a/platform/cooja/sys/cooja_mtarch.h +++ b/platform/cooja/sys/cooja_mtarch.h @@ -32,8 +32,8 @@ * This file is ripped from x86/mtarch.h of the Contiki Multi-threading library. * Fredrik Osterlind */ -#ifndef __COOJA_MTARCH_H__ -#define __COOJA_MTARCH_H__ +#ifndef COOJA_MTARCH_H_ +#define COOJA_MTARCH_H_ #ifndef COOJA_MTARCH_STACKSIZE #define COOJA_MTARCH_STACKSIZE 1024 @@ -48,5 +48,5 @@ struct cooja_mt_thread; int cooja_mtarch_stack_usage(struct cooja_mt_thread *t); -#endif /* __COOJA_MTARCH_H__ */ +#endif /* COOJA_MTARCH_H_ */ diff --git a/platform/cooja/sys/node-id.h b/platform/cooja/sys/node-id.h index ccff77a07..a6876bd1f 100644 --- a/platform/cooja/sys/node-id.h +++ b/platform/cooja/sys/node-id.h @@ -29,11 +29,11 @@ * */ -#ifndef __NODE_ID_H__ -#define __NODE_ID_H__ +#ifndef NODE_ID_H_ +#define NODE_ID_H_ #include "dev/moteid.h" #define node_id simMoteID -#endif /* __NODE_ID_H__ */ +#endif /* NODE_ID_H_ */ diff --git a/platform/econotag/contiki-conf.h b/platform/econotag/contiki-conf.h index 3d3019113..5e1675dc4 100644 --- a/platform/econotag/contiki-conf.h +++ b/platform/econotag/contiki-conf.h @@ -45,8 +45,8 @@ * Mariano Alvira */ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ #include @@ -243,4 +243,4 @@ #include PROJECT_CONF_H #endif /* PROJECT_CONF_H */ -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/platform/exp5438/platform-conf.h b/platform/exp5438/platform-conf.h index bb39d3b32..1e1b24943 100644 --- a/platform/exp5438/platform-conf.h +++ b/platform/exp5438/platform-conf.h @@ -35,8 +35,8 @@ * Joakim Eriksson */ -#ifndef __PLATFORM_CONF_H__ -#define __PLATFORM_CONF_H__ +#ifndef PLATFORM_CONF_H_ +#define PLATFORM_CONF_H_ /* * Definitions below are dictated by the hardware and not really @@ -200,4 +200,4 @@ typedef unsigned long off_t; #define CC2420_SPI_DISABLE() (CC2420_CSN_PORT(OUT) |= BV(CC2420_CSN_PIN)) #define CC2420_SPI_IS_ENABLED() ((CC2420_CSN_PORT(OUT) & BV(CC2420_CSN_PIN)) != BV(CC2420_CSN_PIN)) -#endif /* __PLATFORM_CONF_H__ */ +#endif /* PLATFORM_CONF_H_ */ diff --git a/platform/iris/contiki-conf.h b/platform/iris/contiki-conf.h index 7adf62a6d..1f2908532 100644 --- a/platform/iris/contiki-conf.h +++ b/platform/iris/contiki-conf.h @@ -39,8 +39,8 @@ * Kasun Hewage */ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ #define HAVE_STDINT_H #include "avrdef.h" @@ -194,4 +194,4 @@ typedef unsigned long off_t; #include PROJECT_CONF_H #endif /* PROJECT_CONF_H */ -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/platform/iris/dev/adc.h b/platform/iris/dev/adc.h index 473290b86..a51b3cebe 100644 --- a/platform/iris/dev/adc.h +++ b/platform/iris/dev/adc.h @@ -30,11 +30,11 @@ * */ -#ifndef __ADC_H__ -#define __ADC_H__ +#ifndef ADC_H_ +#define ADC_H_ void adc_init(); uint16_t get_adc(int channel); -#endif /* __ADC_H__ */ +#endif /* ADC_H_ */ diff --git a/platform/iris/dev/sensors/mts300.h b/platform/iris/dev/sensors/mts300.h index d217e9a23..0e07af034 100644 --- a/platform/iris/dev/sensors/mts300.h +++ b/platform/iris/dev/sensors/mts300.h @@ -38,8 +38,8 @@ * Kasun Hewage */ -#ifndef __MTS300_H__ -#define __MTS300_H__ +#ifndef MTS300_H_ +#define MTS300_H_ #include #include "contiki-conf.h" @@ -106,7 +106,7 @@ uint16_t get_mic(); void mts300_init(); -#endif /* __MTS300_H__ */ +#endif /* MTS300_H_ */ diff --git a/platform/iris/init-net.h b/platform/iris/init-net.h index 8c3711980..066a6d4fd 100644 --- a/platform/iris/init-net.h +++ b/platform/iris/init-net.h @@ -38,9 +38,9 @@ * Kasun Hewage */ -#ifndef __INIT_NET_H__ -#define __INIT_NET_H__ +#ifndef INIT_NET_H_ +#define INIT_NET_H_ void init_net(void); -#endif /* __INIT_NET_H__ */ +#endif /* INIT_NET_H_ */ diff --git a/platform/iris/platform-conf.h b/platform/iris/platform-conf.h index 4f79499bd..48659ddae 100644 --- a/platform/iris/platform-conf.h +++ b/platform/iris/platform-conf.h @@ -36,8 +36,8 @@ * Joakim Eriksson */ -#ifndef __PLATFORM_CONF_H__ -#define __PLATFORM_CONF_H__ +#ifndef PLATFORM_CONF_H_ +#define PLATFORM_CONF_H_ /* * Definitions below are dictated by the hardware and not really @@ -131,4 +131,4 @@ void clock_adjust_ticks(clock_time_t howmany); #define CSN 0 -#endif /* __PLATFORM_CONF_H__ */ +#endif /* PLATFORM_CONF_H_ */ diff --git a/platform/mbxxx/apps/shell-sensors.h b/platform/mbxxx/apps/shell-sensors.h index 23d50585a..3edff9181 100644 --- a/platform/mbxxx/apps/shell-sensors.h +++ b/platform/mbxxx/apps/shell-sensors.h @@ -42,12 +42,12 @@ * Salvatore Pitrulli */ -#ifndef __SHELL_SENSORS_H__ -#define __SHELL_SENSORS_H__ +#ifndef SHELL_SENSORS_H_ +#define SHELL_SENSORS_H_ #include "shell.h" void shell_sensors_init(void); -#endif /* __SHELL_SENSORS_H__ */ +#endif /* SHELL_SENSORS_H_ */ /** @} */ diff --git a/platform/mbxxx/board.h b/platform/mbxxx/board.h index 9c83ecd6b..cb0d76757 100644 --- a/platform/mbxxx/board.h +++ b/platform/mbxxx/board.h @@ -48,8 +48,8 @@ * */ /*---------------------------------------------------------------------------*/ -#ifndef _BOARD_H_ -#define _BOARD_H_ +#ifndef BOARD_H_ +#define BOARD_H_ char boardName[16]; @@ -347,7 +347,7 @@ void halBoardPowerDown(void); void boardPrintStringDescription(void); -#endif /* _BOARD_H_ */ +#endif /*BOARD_H_ */ /** @} // END addtogroup */ diff --git a/platform/mbxxx/contiki-conf.h b/platform/mbxxx/contiki-conf.h index 60f4c3b5b..d6fc2b823 100644 --- a/platform/mbxxx/contiki-conf.h +++ b/platform/mbxxx/contiki-conf.h @@ -48,8 +48,8 @@ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ #ifdef PLATFORM_CONF_H #include PLATFORM_CONF_H @@ -173,5 +173,5 @@ #include PROJECT_CONF_H #endif /* PROJECT_CONF_H */ -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ /** @} */ diff --git a/platform/mbxxx/contiki-init-net.h b/platform/mbxxx/contiki-init-net.h index 008ad2431..ca586cd94 100644 --- a/platform/mbxxx/contiki-init-net.h +++ b/platform/mbxxx/contiki-init-net.h @@ -44,10 +44,10 @@ */ /*---------------------------------------------------------------------------*/ -#ifndef __CONTIKI_INIT_NET_H__ -#define __CONTIKI_INIT_NET_H__ +#ifndef CONTIKI_INIT_NET_H_ +#define CONTIKI_INIT_NET_H_ void print_address(uip_ds6_addr_t *lladdr); -#endif /* __CONTIKI_INIT_NET_H__ */ +#endif /* CONTIKI_INIT_NET_H_ */ /** @} */ diff --git a/platform/mbxxx/dev/acc-sensor.h b/platform/mbxxx/dev/acc-sensor.h index 51ab20c72..a33cb5852 100644 --- a/platform/mbxxx/dev/acc-sensor.h +++ b/platform/mbxxx/dev/acc-sensor.h @@ -44,8 +44,8 @@ */ /*---------------------------------------------------------------------------*/ -#ifndef __ACC_SENSOR_H__ -#define __ACC_SENSOR_H__ +#ifndef ACC_SENSOR_H_ +#define ACC_SENSOR_H_ #include "lib/sensors.h" #include "mems.h" @@ -79,5 +79,5 @@ extern const struct sensors_sensor acc_sensor; #define ACC_Y_AXIS 2 #define ACC_Z_AXIS 3 -#endif /* __ACC_SENSOR_H__ */ +#endif /* ACC_SENSOR_H_ */ /** @} */ diff --git a/platform/mbxxx/dev/contact-sensor.h b/platform/mbxxx/dev/contact-sensor.h index d7ebc7412..bb6ee1e2f 100644 --- a/platform/mbxxx/dev/contact-sensor.h +++ b/platform/mbxxx/dev/contact-sensor.h @@ -45,8 +45,8 @@ */ /*---------------------------------------------------------------------------*/ -#ifndef __CONTACT_SENSOR_H__ -#define __CONTACT_SENSOR_H__ +#ifndef CONTACT_SENSOR_H_ +#define CONTACT_SENSOR_H_ #include "lib/sensors.h" @@ -54,5 +54,5 @@ extern const struct sensors_sensor contact_sensor; #define CONTACT_SENSOR "Contact" -#endif /* __CONTACT_SENSOR_H__ */ +#endif /* CONTACT_SENSOR_H_ */ /** @} */ diff --git a/platform/mbxxx/dev/mems.h b/platform/mbxxx/dev/mems.h index 4f72a2291..c200ac373 100644 --- a/platform/mbxxx/dev/mems.h +++ b/platform/mbxxx/dev/mems.h @@ -18,8 +18,8 @@ * INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. *******************************************************************************/ -#ifndef _MEMS_H_ -#define _MEMS_H_ +#ifndef MEMS_H_ +#define MEMS_H_ /* Define --------------------------------------------------------------------*/ #include "mems_regs.h" @@ -59,7 +59,7 @@ boolean MEMS_GetFullScale(void); /* Get mems acceleration values */ uint8_t Mems_GetValue(t_mems_data *mems_data); -#endif /* _MEMS_H_ */ +#endif /*MEMS_H_ */ /******************* (C) COPYRIGHT 2009 STMicroelectronics *****END OF FILE****/ /** @} */ diff --git a/platform/mbxxx/dev/mems_regs.h b/platform/mbxxx/dev/mems_regs.h index ab0276846..33da5c82a 100644 --- a/platform/mbxxx/dev/mems_regs.h +++ b/platform/mbxxx/dev/mems_regs.h @@ -18,8 +18,8 @@ * INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. *******************************************************************************/ -#ifndef _MEMS_REGS_H_ -#define _MEMS_REGS_H_ +#ifndef MEMS_REGS_H_ +#define MEMS_REGS_H_ /* Private include ------------------------------------------------------------*/ @@ -139,7 +139,7 @@ uint8_t i2c_read_reg (uint8_t slave_addr, uint8_t reg_addr, uint8_t *pBuffer, ui //-reg_value is the value of the register to be written---// uint8_t i2c_write_reg (uint8_t slave_addr, uint8_t reg_addr, uint8_t reg_value); -#endif /* _MEMS_REGS_H_ */ +#endif /*MEMS_REGS_H_ */ /******************* (C) COPYRIGHT 2009 STMicroelectronics *****END OF FILE****/ /** @} */ diff --git a/platform/mbxxx/dev/temperature-sensor.h b/platform/mbxxx/dev/temperature-sensor.h index 48b218342..a9f6400a4 100644 --- a/platform/mbxxx/dev/temperature-sensor.h +++ b/platform/mbxxx/dev/temperature-sensor.h @@ -54,8 +54,8 @@ * (see STM32W108 errata). */ -#ifndef __TEMPERATURE_SENSOR_H__ -#define __TEMPERATURE_SENSOR_H__ +#ifndef TEMPERATURE_SENSOR_H_ +#define TEMPERATURE_SENSOR_H_ #include "lib/sensors.h" @@ -63,5 +63,5 @@ extern const struct sensors_sensor temperature_sensor; #define TEMPERATURE_SENSOR "Temperature" -#endif /* __TEMPERATURE_SENSOR_H__ */ +#endif /* TEMPERATURE_SENSOR_H_ */ /** @} */ diff --git a/platform/mbxxx/platform-conf.h b/platform/mbxxx/platform-conf.h index 7c19a9e52..6d56f3d41 100644 --- a/platform/mbxxx/platform-conf.h +++ b/platform/mbxxx/platform-conf.h @@ -48,8 +48,8 @@ */ /*---------------------------------------------------------------------------*/ -#ifndef __PLATFORM_CONF_H__ -#define __PLATFORM_CONF_H__ +#ifndef PLATFORM_CONF_H_ +#define PLATFORM_CONF_H_ #include PLATFORM_HEADER @@ -98,5 +98,5 @@ typedef unsigned long rtimer_clock_t; #define UIP_CONF_BYTE_ORDER UIP_LITTLE_ENDIAN -#endif /* __PLATFORM_CONF_H__ */ +#endif /* PLATFORM_CONF_H_ */ /** @} */ diff --git a/platform/micaz/contiki-conf.h b/platform/micaz/contiki-conf.h index e12140445..38d666e0b 100644 --- a/platform/micaz/contiki-conf.h +++ b/platform/micaz/contiki-conf.h @@ -39,8 +39,8 @@ * Kasun Hewage */ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ #define HAVE_STDINT_H #include "avrdef.h" @@ -203,4 +203,4 @@ typedef unsigned short uip_stats_t; typedef unsigned long off_t; -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/platform/micaz/dev/adc.h b/platform/micaz/dev/adc.h index 473290b86..a51b3cebe 100644 --- a/platform/micaz/dev/adc.h +++ b/platform/micaz/dev/adc.h @@ -30,11 +30,11 @@ * */ -#ifndef __ADC_H__ -#define __ADC_H__ +#ifndef ADC_H_ +#define ADC_H_ void adc_init(); uint16_t get_adc(int channel); -#endif /* __ADC_H__ */ +#endif /* ADC_H_ */ diff --git a/platform/micaz/dev/sensors/mts300.h b/platform/micaz/dev/sensors/mts300.h index d217e9a23..0e07af034 100644 --- a/platform/micaz/dev/sensors/mts300.h +++ b/platform/micaz/dev/sensors/mts300.h @@ -38,8 +38,8 @@ * Kasun Hewage */ -#ifndef __MTS300_H__ -#define __MTS300_H__ +#ifndef MTS300_H_ +#define MTS300_H_ #include #include "contiki-conf.h" @@ -106,7 +106,7 @@ uint16_t get_mic(); void mts300_init(); -#endif /* __MTS300_H__ */ +#endif /* MTS300_H_ */ diff --git a/platform/micaz/init-net.h b/platform/micaz/init-net.h index 8c3711980..066a6d4fd 100644 --- a/platform/micaz/init-net.h +++ b/platform/micaz/init-net.h @@ -38,9 +38,9 @@ * Kasun Hewage */ -#ifndef __INIT_NET_H__ -#define __INIT_NET_H__ +#ifndef INIT_NET_H_ +#define INIT_NET_H_ void init_net(void); -#endif /* __INIT_NET_H__ */ +#endif /* INIT_NET_H_ */ diff --git a/platform/micaz/platform-conf.h b/platform/micaz/platform-conf.h index ebf459031..9a5a41f8c 100644 --- a/platform/micaz/platform-conf.h +++ b/platform/micaz/platform-conf.h @@ -36,8 +36,8 @@ * Joakim Eriksson */ -#ifndef __PLATFORM_CONF_H__ -#define __PLATFORM_CONF_H__ +#ifndef PLATFORM_CONF_H_ +#define PLATFORM_CONF_H_ /* * Definitions below are dictated by the hardware and not really @@ -208,4 +208,4 @@ void clock_adjust_ticks(clock_time_t howmany); #define CC2420_SPI_ENABLE() (PORTB &= ~BV(CSN)) /* ENABLE CSn (active low) */ #define CC2420_SPI_DISABLE() (PORTB |= BV(CSN)) /* DISABLE CSn (active low) */ -#endif /* __PLATFORM_CONF_H__ */ +#endif /* PLATFORM_CONF_H_ */ diff --git a/platform/minimal-net/contiki-conf.h b/platform/minimal-net/contiki-conf.h index 7fc897886..3fb85b001 100644 --- a/platform/minimal-net/contiki-conf.h +++ b/platform/minimal-net/contiki-conf.h @@ -30,8 +30,8 @@ * */ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ #include #include @@ -179,4 +179,4 @@ typedef unsigned long clock_time_t; /* Not part of C99 but actually present */ int strcasecmp(const char*, const char*); -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/platform/native/contiki-conf.h b/platform/native/contiki-conf.h index 4b425097c..018268d03 100644 --- a/platform/native/contiki-conf.h +++ b/platform/native/contiki-conf.h @@ -30,8 +30,8 @@ * */ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ #include #ifndef WIN32_LEAN_AND_MEAN @@ -281,4 +281,4 @@ int strcasecmp(const char*, const char*); #include PROJECT_CONF_H #endif /* PROJECT_CONF_H */ -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/platform/native/ctk/ctk-curses.h b/platform/native/ctk/ctk-curses.h index 98d432d5b..24ca8be2c 100644 --- a/platform/native/ctk/ctk-curses.h +++ b/platform/native/ctk/ctk-curses.h @@ -30,8 +30,8 @@ * * Author: François Revol */ -#ifndef __CTK_CONSOLE_H__ -#define __CTK_CONSOLE_H__ +#ifndef CTK_CONSOLE_H_ +#define CTK_CONSOLE_H_ #define cputc console_cputc #define cputs console_cputs @@ -63,4 +63,4 @@ void textcolor(unsigned char c); char ctk_arch_getkey(void); unsigned char ctk_arch_keyavail(void); -#endif /* __CTK_CONSOLE_H__ */ +#endif /* CTK_CONSOLE_H_ */ diff --git a/platform/native/dev/beep.h b/platform/native/dev/beep.h index 5dec63179..c2ab7d3f7 100644 --- a/platform/native/dev/beep.h +++ b/platform/native/dev/beep.h @@ -46,8 +46,8 @@ * */ -#ifndef __BEEP_H__ -#define __BEEP_H__ +#ifndef BEEP_H_ +#define BEEP_H_ #define BEEP_ALARM1 1 #define BEEP_ALARM2 2 @@ -159,4 +159,4 @@ void beep_quick(int num); /** @} */ /** @} */ -#endif /* __BEEP_H__ */ +#endif /* BEEP_H_ */ diff --git a/platform/native/dev/button-sensor.h b/platform/native/dev/button-sensor.h index 2a3f28459..2eadebd5f 100644 --- a/platform/native/dev/button-sensor.h +++ b/platform/native/dev/button-sensor.h @@ -1,5 +1,5 @@ -#ifndef __BUTTON_SENSOR_H__ -#define __BUTTON_SENSOR_H__ +#ifndef BUTTON_SENSOR_H_ +#define BUTTON_SENSOR_H_ #include "lib/sensors.h" @@ -9,4 +9,4 @@ extern const struct sensors_sensor button_sensor; void button_press(void); -#endif /* __BUTTON_SENSOR_H__ */ +#endif /* BUTTON_SENSOR_H_ */ diff --git a/platform/native/dev/pir-sensor.h b/platform/native/dev/pir-sensor.h index 84659c760..3cbf181b6 100644 --- a/platform/native/dev/pir-sensor.h +++ b/platform/native/dev/pir-sensor.h @@ -1,5 +1,5 @@ -#ifndef __PIR_SENSOR_H__ -#define __PIR_SENSOR_H__ +#ifndef PIR_SENSOR_H_ +#define PIR_SENSOR_H_ #include "lib/sensors.h" @@ -9,4 +9,4 @@ extern const struct sensors_sensor pir_sensor; void pir_sensor_changed(int strength); -#endif /* __PIR_SENSOR_H__ */ +#endif /* PIR_SENSOR_H_ */ diff --git a/platform/native/dev/temperature-sensor.h b/platform/native/dev/temperature-sensor.h index b7e37b404..89a13324c 100644 --- a/platform/native/dev/temperature-sensor.h +++ b/platform/native/dev/temperature-sensor.h @@ -38,8 +38,8 @@ * $Revision: 1.1 $ */ -#ifndef __TEMPERATURE_SENSOR_H__ -#define __TEMPERATURE_SENSOR_H__ +#ifndef TEMPERATURE_SENSOR_H_ +#define TEMPERATURE_SENSOR_H_ #include "lib/sensors.h" @@ -47,4 +47,4 @@ extern const struct sensors_sensor temperature_sensor; #define TEMPERATURE_SENSOR "Temperature" -#endif /* __TEMPERATURE_SENSOR_H__ */ +#endif /* TEMPERATURE_SENSOR_H_ */ diff --git a/platform/native/dev/vib-sensor.h b/platform/native/dev/vib-sensor.h index 63829973a..c95caa9a5 100644 --- a/platform/native/dev/vib-sensor.h +++ b/platform/native/dev/vib-sensor.h @@ -38,8 +38,8 @@ * $Revision: 1.1 $ */ -#ifndef __VIB_SENSOR_H__ -#define __VIB_SENSOR_H__ +#ifndef VIB_SENSOR_H_ +#define VIB_SENSOR_H_ #include "lib/sensors.h" @@ -49,4 +49,4 @@ extern const struct sensors_sensor vib_sensor; void vib_sensor_changed(void); -#endif /* __VIB_SENSOR_H__ */ +#endif /* VIB_SENSOR_H_ */ diff --git a/platform/seedeye/dev/mrf24j40/mrf24j40.h b/platform/seedeye/dev/mrf24j40/mrf24j40.h index 52b727891..34ea55594 100644 --- a/platform/seedeye/dev/mrf24j40/mrf24j40.h +++ b/platform/seedeye/dev/mrf24j40/mrf24j40.h @@ -47,8 +47,8 @@ * \date 2012-03-21 */ -#ifndef __MRF24J40_H__ -#define __MRF24J40_H__ +#ifndef MRF24J40_H_ +#define MRF24J40_H_ #include #include @@ -223,6 +223,6 @@ typedef union _INT_status { } bits; } INT_status; -#endif /* __MRF24J40_H__ */ +#endif /* MRF24J40_H_ */ /** @} */ diff --git a/platform/seedeye/dev/mrf24j40/mrf24j40_arch.h b/platform/seedeye/dev/mrf24j40/mrf24j40_arch.h index 8a3cda91d..04bd4c87c 100644 --- a/platform/seedeye/dev/mrf24j40/mrf24j40_arch.h +++ b/platform/seedeye/dev/mrf24j40/mrf24j40_arch.h @@ -47,8 +47,8 @@ * \date 2012-03-21 */ -#ifndef __MRF24J40_ARCH_H__ -#define __MRF24J40_ARCH_H__ +#ifndef MRF24J40_ARCH_H_ +#define MRF24J40_ARCH_H_ #include "p32xxxx.h" @@ -123,6 +123,6 @@ do { \ MRF24J40_INTERRUPT_ENABLE_SET(); \ } while(0) -#endif /* __MRF24J40_ARCH_H__ */ +#endif /* MRF24J40_ARCH_H_ */ /** @} */ diff --git a/platform/seedeye/init-net.h b/platform/seedeye/init-net.h index 8f9bcbb27..b217aa218 100644 --- a/platform/seedeye/init-net.h +++ b/platform/seedeye/init-net.h @@ -47,13 +47,13 @@ * \date 2012-03-25 */ -#ifndef __INIT_NET_H__ -#define __INIT_NET_H__ +#ifndef INIT_NET_H_ +#define INIT_NET_H_ #include void init_net(uint8_t ); -#endif /* __INIT_NET_H__ */ +#endif /* INIT_NET_H_ */ /** @} */ diff --git a/platform/seedeye/platform-conf.h b/platform/seedeye/platform-conf.h index d78fc51e1..c33d500b3 100644 --- a/platform/seedeye/platform-conf.h +++ b/platform/seedeye/platform-conf.h @@ -40,8 +40,8 @@ * \date 2012-06-06 */ -#ifndef __PLATFORM_CONF_H__ -#define __PLATFORM_CONF_H__ +#ifndef PLATFORM_CONF_H_ +#define PLATFORM_CONF_H_ #ifndef SEEDEYE_ID #define SEEDEYE_ID 1 @@ -61,4 +61,4 @@ #define CLOCK_CONF_SECOND 1024 -#endif /* __PLATFORM_CONF_H__ */ +#endif /* PLATFORM_CONF_H_ */ diff --git a/platform/sensinode/contiki-conf.h b/platform/sensinode/contiki-conf.h index f3a2a468e..97231b90f 100644 --- a/platform/sensinode/contiki-conf.h +++ b/platform/sensinode/contiki-conf.h @@ -1,5 +1,5 @@ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ #include "8051def.h" #include "sys/cc.h" @@ -283,4 +283,4 @@ #define UIP_CONF_DS6_AADDR_NBU 1 #endif -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/platform/sensinode/dev/button-sensor.h b/platform/sensinode/dev/button-sensor.h index df3ee6e19..97a185223 100644 --- a/platform/sensinode/dev/button-sensor.h +++ b/platform/sensinode/dev/button-sensor.h @@ -40,9 +40,9 @@ * George Oikonomou - */ -#ifndef __BUTTON_SENSOR_H__ -#define __BUTTON_SENSOR_H__ +#ifndef BUTTON_SENSOR_H_ +#define BUTTON_SENSOR_H_ #include "dev/sensinode-sensors.h" -#endif /* __BUTTON_SENSOR_H__ */ +#endif /* BUTTON_SENSOR_H_ */ diff --git a/platform/sensinode/dev/models.h b/platform/sensinode/dev/models.h index 500932b17..6cf4916f4 100644 --- a/platform/sensinode/dev/models.h +++ b/platform/sensinode/dev/models.h @@ -1,5 +1,5 @@ -#ifndef __MODELS_H__ -#define __MODELS_H__ +#ifndef MODELS_H_ +#define MODELS_H_ /* Define model text */ #ifdef MODEL_N100 @@ -57,4 +57,4 @@ /* Model-Specific startup functions */ void model_init(); void model_uart_intr_en(); -#endif /* __MODELS_H__ */ +#endif /* MODELS_H_ */ diff --git a/platform/sky/dev/light-sensor.h b/platform/sky/dev/light-sensor.h index 486e6a8bb..411c6fa33 100644 --- a/platform/sky/dev/light-sensor.h +++ b/platform/sky/dev/light-sensor.h @@ -36,8 +36,8 @@ * $Revision: 1.2 $ */ -#ifndef __LIGHT_SENSOR_H__ -#define __LIGHT_SENSOR_H__ +#ifndef LIGHT_SENSOR_H_ +#define LIGHT_SENSOR_H_ #include "lib/sensors.h" @@ -47,4 +47,4 @@ extern const struct sensors_sensor light_sensor; #define LIGHT_SENSOR_TOTAL_SOLAR 1 -#endif /* __LIGHT-SENSOR_H__ */ +#endif /* LIGHT-SENSOR_H_ */ diff --git a/platform/sky/dev/light.h b/platform/sky/dev/light.h index 8ea84b997..52962b162 100644 --- a/platform/sky/dev/light.h +++ b/platform/sky/dev/light.h @@ -29,12 +29,12 @@ * This file is part of the Contiki operating system. * */ -#ifndef __LIGHT_H__ -#define __LIGHT_H__ +#ifndef LIGHT_H_ +#define LIGHT_H_ void sensors_light_init(void); unsigned sensors_light1(void); unsigned sensors_light2(void); -#endif /* __LIGHT_H__ */ +#endif /* LIGHT_H_ */ diff --git a/platform/sky/dev/sky-sensors.h b/platform/sky/dev/sky-sensors.h index 4a5e8d9e1..df2aeea48 100644 --- a/platform/sky/dev/sky-sensors.h +++ b/platform/sky/dev/sky-sensors.h @@ -36,11 +36,11 @@ * $Revision: 1.2 $ */ -#ifndef __SKY_SENSORS_H__ -#define __SKY_SENSORS_H__ +#ifndef SKY_SENSORS_H_ +#define SKY_SENSORS_H_ int sky_sensors_status(uint16_t input, int type); int sky_sensors_configure(uint16_t input, uint8_t reference, int type, int value); -#endif /* __SKY_SENSORS_H__ */ +#endif /* SKY_SENSORS_H_ */ diff --git a/platform/sky/dev/temperature-sensor.h b/platform/sky/dev/temperature-sensor.h index 6ac9b77d2..05eafe852 100644 --- a/platform/sky/dev/temperature-sensor.h +++ b/platform/sky/dev/temperature-sensor.h @@ -37,8 +37,8 @@ * Niclas Finne */ -#ifndef __TEMPERATURE_SENSOR_H__ -#define __TEMPERATURE_SENSOR_H__ +#ifndef TEMPERATURE_SENSOR_H_ +#define TEMPERATURE_SENSOR_H_ #include "lib/sensors.h" @@ -46,4 +46,4 @@ extern const struct sensors_sensor temperature_sensor; #define TEMPERATURE_SENSOR "Temperature" -#endif /* __TEMPERATURE_SENSOR_H__ */ +#endif /* TEMPERATURE_SENSOR_H_ */ diff --git a/platform/sky/platform-conf.h b/platform/sky/platform-conf.h index ea1ee7acd..e597a208f 100644 --- a/platform/sky/platform-conf.h +++ b/platform/sky/platform-conf.h @@ -36,8 +36,8 @@ * Joakim Eriksson */ -#ifndef __PLATFORM_CONF_H__ -#define __PLATFORM_CONF_H__ +#ifndef PLATFORM_CONF_H_ +#define PLATFORM_CONF_H_ /* * Definitions below are dictated by the hardware and not really @@ -209,4 +209,4 @@ typedef unsigned long off_t; #define CC2420_SPI_DISABLE() (CC2420_CSN_PORT(OUT) |= BV(CC2420_CSN_PIN)) #define CC2420_SPI_IS_ENABLED() ((CC2420_CSN_PORT(OUT) & BV(CC2420_CSN_PIN)) != BV(CC2420_CSN_PIN)) -#endif /* __PLATFORM_CONF_H__ */ +#endif /* PLATFORM_CONF_H_ */ diff --git a/platform/stm32test/contiki-conf.h b/platform/stm32test/contiki-conf.h index ee1ad8677..e45f00d69 100644 --- a/platform/stm32test/contiki-conf.h +++ b/platform/stm32test/contiki-conf.h @@ -1,5 +1,5 @@ -#ifndef __CONTIKI_CONF_H__CDBB4VIH3I__ -#define __CONTIKI_CONF_H__CDBB4VIH3I__ +#ifndef CONTIKI_CONF_H_CDBB4VIH3I__ +#define CONTIKI_CONF_H_CDBB4VIH3I__ #include @@ -43,4 +43,4 @@ typedef unsigned int uip_stats_t; #define USB_EP2_SIZE 64 #define RAND_MAX 0x7fff -#endif /* __CONTIKI_CONF_H__CDBB4VIH3I__ */ +#endif /* CONTIKI_CONF_H_CDBB4VIH3I__ */ diff --git a/platform/win32/contiki-conf.h b/platform/win32/contiki-conf.h index d145d6b00..11e80ab49 100644 --- a/platform/win32/contiki-conf.h +++ b/platform/win32/contiki-conf.h @@ -1,5 +1,5 @@ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ #ifdef __CYGWIN__ #include @@ -183,4 +183,4 @@ typedef unsigned short uip_stats_t; #define WWW_CONF_WEBPAGE_HEIGHT 30 #endif /* PLATFORM_BUILD */ -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/platform/win32/ctk/ctk-console.h b/platform/win32/ctk/ctk-console.h index adcabcb71..5bb7d9c67 100644 --- a/platform/win32/ctk/ctk-console.h +++ b/platform/win32/ctk/ctk-console.h @@ -31,8 +31,8 @@ * Author: Oliver Schmidt * */ -#ifndef __CTK_CONSOLE_H__ -#define __CTK_CONSOLE_H__ +#ifndef CTK_CONSOLE_H_ +#define CTK_CONSOLE_H_ #define cputc console_cputc #define cputs console_cputs @@ -64,4 +64,4 @@ void textcolor(unsigned char c); char ctk_arch_getkey(void); unsigned char ctk_arch_keyavail(void); -#endif /* __CTK_CONSOLE_H__ */ +#endif /* CTK_CONSOLE_H_ */ diff --git a/platform/win32/loader/dll-loader.h b/platform/win32/loader/dll-loader.h index f459aefeb..a002f00b5 100644 --- a/platform/win32/loader/dll-loader.h +++ b/platform/win32/loader/dll-loader.h @@ -31,8 +31,8 @@ * Author: Oliver Schmidt * */ -#ifndef __DLL_LOADER_H__ -#define __DLL_LOADER_H__ +#ifndef DLL_LOADER_H_ +#define DLL_LOADER_H_ #define LOADER_LOAD(name, arg) dll_loader_load(name, arg) #define LOADER_UNLOAD() dll_loader_unload((void *)autostart_processes) @@ -44,4 +44,4 @@ CCIF void dll_loader_unload(void *addr); CCIF struct dsc *dll_loader_load_dsc(char *name); CCIF void __stdcall dll_loader_unload_dsc(void *addr); -#endif /* __DLL_LOADER_H__ */ +#endif /* DLL_LOADER_H_ */ diff --git a/platform/win32/loader/unload.h b/platform/win32/loader/unload.h index 9dcfbda15..d70a7b706 100644 --- a/platform/win32/loader/unload.h +++ b/platform/win32/loader/unload.h @@ -32,11 +32,11 @@ * */ -#ifndef __UNLOAD_H__ -#define __UNLOAD_H__ +#ifndef UNLOAD_H_ +#define UNLOAD_H_ #define LOADER_UNLOAD unload void unload(void); -#endif /* __UNLOAD_H__ */ +#endif /* UNLOAD_H_ */ diff --git a/platform/wismote/dev/acc-sensor.h b/platform/wismote/dev/acc-sensor.h index 89df783a8..4cd1ea6a7 100644 --- a/platform/wismote/dev/acc-sensor.h +++ b/platform/wismote/dev/acc-sensor.h @@ -32,8 +32,8 @@ * Created : 2005-11-01 */ -#ifndef __ACC_SENSOR_H__ -#define __ACC_SENSOR_H__ +#ifndef ACC_SENSOR_H_ +#define ACC_SENSOR_H_ #include "lib/sensors.h" @@ -41,4 +41,4 @@ extern const struct sensors_sensor acc_sensor; #define ACC_SENSOR "Acc" -#endif /* __ACC_SENSOR_H__ */ +#endif /* ACC_SENSOR_H_ */ diff --git a/platform/wismote/dev/ext-sensor.h b/platform/wismote/dev/ext-sensor.h index e9248144d..0a1122840 100644 --- a/platform/wismote/dev/ext-sensor.h +++ b/platform/wismote/dev/ext-sensor.h @@ -32,8 +32,8 @@ * Created : 2005-11-01 */ -#ifndef __EXT_SENSOR_H__ -#define __EXT_SENSOR_H__ +#ifndef EXT_SENSOR_H_ +#define EXT_SENSOR_H_ #include "lib/sensors.h" @@ -46,4 +46,4 @@ extern const struct sensors_sensor ext_sensor; #define EXT_SENSOR "Ext" -#endif /* __EXT_SENSOR_H__ */ +#endif /* EXT_SENSOR_H_ */ diff --git a/platform/wismote/dev/light-sensor.h b/platform/wismote/dev/light-sensor.h index 486e6a8bb..411c6fa33 100644 --- a/platform/wismote/dev/light-sensor.h +++ b/platform/wismote/dev/light-sensor.h @@ -36,8 +36,8 @@ * $Revision: 1.2 $ */ -#ifndef __LIGHT_SENSOR_H__ -#define __LIGHT_SENSOR_H__ +#ifndef LIGHT_SENSOR_H_ +#define LIGHT_SENSOR_H_ #include "lib/sensors.h" @@ -47,4 +47,4 @@ extern const struct sensors_sensor light_sensor; #define LIGHT_SENSOR_TOTAL_SOLAR 1 -#endif /* __LIGHT-SENSOR_H__ */ +#endif /* LIGHT-SENSOR_H_ */ diff --git a/platform/wismote/dev/light.h b/platform/wismote/dev/light.h index 8ea84b997..52962b162 100644 --- a/platform/wismote/dev/light.h +++ b/platform/wismote/dev/light.h @@ -29,12 +29,12 @@ * This file is part of the Contiki operating system. * */ -#ifndef __LIGHT_H__ -#define __LIGHT_H__ +#ifndef LIGHT_H_ +#define LIGHT_H_ void sensors_light_init(void); unsigned sensors_light1(void); unsigned sensors_light2(void); -#endif /* __LIGHT_H__ */ +#endif /* LIGHT_H_ */ diff --git a/platform/wismote/dev/sky-sensors.h b/platform/wismote/dev/sky-sensors.h index ec3136e2b..f0cdcd1f3 100644 --- a/platform/wismote/dev/sky-sensors.h +++ b/platform/wismote/dev/sky-sensors.h @@ -36,10 +36,10 @@ * $Revision: 1.1 $ */ -#ifndef __SKY_SENSORS_H__ -#define __SKY_SENSORS_H__ +#ifndef SKY_SENSORS_H_ +#define SKY_SENSORS_H_ void sky_sensors_activate(uint8_t); void sky_sensors_deactivate(uint8_t); -#endif /* __SKY_SENSORS_H__ */ +#endif /* SKY_SENSORS_H_ */ diff --git a/platform/wismote/platform-conf.h b/platform/wismote/platform-conf.h index c2a7e6be0..18fe67de5 100644 --- a/platform/wismote/platform-conf.h +++ b/platform/wismote/platform-conf.h @@ -32,8 +32,8 @@ * Platform configuration for the wismote platform. */ -#ifndef __PLATFORM_CONF_H__ -#define __PLATFORM_CONF_H__ +#ifndef PLATFORM_CONF_H_ +#define PLATFORM_CONF_H_ /* * Definitions below are dictated by the hardware and not really @@ -197,4 +197,4 @@ typedef unsigned long off_t; #define CC2520_SPI_DISABLE() do{clock_delay(5);UCB0CTL1 |= UCSWRST;clock_delay(1); P3OUT |= BIT0;clock_delay(5);}while(0) #define CC2520_SPI_IS_ENABLED() ((CC2520_CSN_PORT(OUT) & BV(CC2520_CSN_PIN)) != BV(CC2520_CSN_PIN)) -#endif /* __PLATFORM_CONF_H__ */ +#endif /* PLATFORM_CONF_H_ */ diff --git a/platform/z1/dev/adxl345.h b/platform/z1/dev/adxl345.h index c0cc6e7f6..082572715 100644 --- a/platform/z1/dev/adxl345.h +++ b/platform/z1/dev/adxl345.h @@ -38,8 +38,8 @@ * Enric Calvo, Zolertia */ -#ifndef __ADXL345_H__ -#define __ADXL345_H__ +#ifndef ADXL345_H_ +#define ADXL345_H_ #include #include "dev/i2cmaster.h" @@ -290,4 +290,4 @@ extern process_event_t int1_event, int2_event; // static ? /* -------------------------------------------------------------------------- */ -#endif /* ifndef __ADXL345_H__ */ +#endif /* ifndef ADXL345_H_ */ diff --git a/platform/z1/dev/i2cmaster.h b/platform/z1/dev/i2cmaster.h index 25bd7c233..29ee9a653 100644 --- a/platform/z1/dev/i2cmaster.h +++ b/platform/z1/dev/i2cmaster.h @@ -38,8 +38,8 @@ * Marcus Lundén, SICS */ -#ifndef __I2CMASTER_H__ -#define __I2CMASTER_H__ +#ifndef I2CMASTER_H_ +#define I2CMASTER_H_ #include "contiki.h" @@ -87,4 +87,4 @@ uint8_t i2c_busy(void); #define PRINTFDEBUG(...) #endif -#endif /* #ifdef __I2CMASTER_H__ */ +#endif /* #ifdef I2CMASTER_H_ */ diff --git a/platform/z1/dev/light-sensor.h b/platform/z1/dev/light-sensor.h index 486e6a8bb..411c6fa33 100644 --- a/platform/z1/dev/light-sensor.h +++ b/platform/z1/dev/light-sensor.h @@ -36,8 +36,8 @@ * $Revision: 1.2 $ */ -#ifndef __LIGHT_SENSOR_H__ -#define __LIGHT_SENSOR_H__ +#ifndef LIGHT_SENSOR_H_ +#define LIGHT_SENSOR_H_ #include "lib/sensors.h" @@ -47,4 +47,4 @@ extern const struct sensors_sensor light_sensor; #define LIGHT_SENSOR_TOTAL_SOLAR 1 -#endif /* __LIGHT-SENSOR_H__ */ +#endif /* LIGHT-SENSOR_H_ */ diff --git a/platform/z1/dev/light-ziglet.h b/platform/z1/dev/light-ziglet.h index c6ef71b7a..6b100c551 100644 --- a/platform/z1/dev/light-ziglet.h +++ b/platform/z1/dev/light-ziglet.h @@ -38,8 +38,8 @@ * Marcus Lundén, SICS */ -#ifndef __LIGHT_ZIGLET_H__ -#define __LIGHT_ZIGLET_H__ +#ifndef LIGHT_ZIGLET_H_ +#define LIGHT_ZIGLET_H_ #include #include "i2cmaster.h" @@ -121,7 +121,7 @@ uint16_t light_ziglet_on(void); #define M8T 0x0000 /* -------------------------------------------------------------------------- */ -#endif /* ifndef __LIGHT_ZIGLET_H__ */ +#endif /* ifndef LIGHT_ZIGLET_H_ */ diff --git a/platform/z1/dev/light.h b/platform/z1/dev/light.h index 8ea84b997..52962b162 100644 --- a/platform/z1/dev/light.h +++ b/platform/z1/dev/light.h @@ -29,12 +29,12 @@ * This file is part of the Contiki operating system. * */ -#ifndef __LIGHT_H__ -#define __LIGHT_H__ +#ifndef LIGHT_H_ +#define LIGHT_H_ void sensors_light_init(void); unsigned sensors_light1(void); unsigned sensors_light2(void); -#endif /* __LIGHT_H__ */ +#endif /* LIGHT_H_ */ diff --git a/platform/z1/dev/potentiometer-sensor.h b/platform/z1/dev/potentiometer-sensor.h index 93e5a968a..d9d8b983d 100644 --- a/platform/z1/dev/potentiometer-sensor.h +++ b/platform/z1/dev/potentiometer-sensor.h @@ -34,8 +34,8 @@ * $Revision: 1.0 $ */ -#ifndef __POTENTIOMETER_SENSOR_H__ -#define __POTENTIOMETER_SENSOR_H__ +#ifndef POTENTIOMETER_SENSOR_H_ +#define POTENTIOMETER_SENSOR_H_ #include "lib/sensors.h" @@ -43,4 +43,4 @@ extern const struct sensors_sensor potentiometer_sensor; #define POTENTIOMETER_SENSOR "Potentiometer" -#endif /* __POTENTIOMETER_SENSOR_H__ */ +#endif /* POTENTIOMETER_SENSOR_H_ */ diff --git a/platform/z1/dev/relay-phidget.h b/platform/z1/dev/relay-phidget.h index 431b97bb4..9cc4b3475 100644 --- a/platform/z1/dev/relay-phidget.h +++ b/platform/z1/dev/relay-phidget.h @@ -37,8 +37,8 @@ * */ -#ifndef __RELAY_PHIDGET_H__ -#define __RELAY_PHIDGETS_H__ +#ifndef RELAY_PHIDGET_H_ +#define RELAY_PHIDGETS_H_ void relay_enable(uint8_t pin); @@ -47,4 +47,4 @@ void relay_off(); uint8_t relay_toogle(); -#endif /* __RELAY_PHIDGET_H__ */ +#endif /* RELAY_PHIDGET_H_ */ diff --git a/platform/z1/dev/sky-sensors.h b/platform/z1/dev/sky-sensors.h index 4a5e8d9e1..df2aeea48 100644 --- a/platform/z1/dev/sky-sensors.h +++ b/platform/z1/dev/sky-sensors.h @@ -36,11 +36,11 @@ * $Revision: 1.2 $ */ -#ifndef __SKY_SENSORS_H__ -#define __SKY_SENSORS_H__ +#ifndef SKY_SENSORS_H_ +#define SKY_SENSORS_H_ int sky_sensors_status(uint16_t input, int type); int sky_sensors_configure(uint16_t input, uint8_t reference, int type, int value); -#endif /* __SKY_SENSORS_H__ */ +#endif /* SKY_SENSORS_H_ */ diff --git a/platform/z1/dev/temperature-sensor.h b/platform/z1/dev/temperature-sensor.h index 6ac9b77d2..05eafe852 100644 --- a/platform/z1/dev/temperature-sensor.h +++ b/platform/z1/dev/temperature-sensor.h @@ -37,8 +37,8 @@ * Niclas Finne */ -#ifndef __TEMPERATURE_SENSOR_H__ -#define __TEMPERATURE_SENSOR_H__ +#ifndef TEMPERATURE_SENSOR_H_ +#define TEMPERATURE_SENSOR_H_ #include "lib/sensors.h" @@ -46,4 +46,4 @@ extern const struct sensors_sensor temperature_sensor; #define TEMPERATURE_SENSOR "Temperature" -#endif /* __TEMPERATURE_SENSOR_H__ */ +#endif /* TEMPERATURE_SENSOR_H_ */ diff --git a/platform/z1/dev/tlc59116.h b/platform/z1/dev/tlc59116.h index 39708de77..694569b06 100644 --- a/platform/z1/dev/tlc59116.h +++ b/platform/z1/dev/tlc59116.h @@ -38,8 +38,8 @@ * Jelmer Tiete, VUB */ -#ifndef __TLC59116_H__ -#define __TLC59116_H__ +#ifndef TLC59116_H_ +#define TLC59116_H_ #include #include "dev/i2cmaster.h" @@ -139,4 +139,4 @@ void tlc59116_led(uint8_t led, uint8_t pwm); /* More registers follow, but not used in this implementation */ /* -------------------------------------------------------------------------- */ -#endif /* ifndef __TLC59116_H__ */ +#endif /* ifndef TLC59116_H_ */ diff --git a/platform/z1/dev/tmp102.h b/platform/z1/dev/tmp102.h index 3265e976d..777577747 100644 --- a/platform/z1/dev/tmp102.h +++ b/platform/z1/dev/tmp102.h @@ -38,8 +38,8 @@ * Marcus Lundén, SICS */ -#ifndef __TMP102_H__ -#define __TMP102_H__ +#ifndef TMP102_H_ +#define TMP102_H_ #include #include "i2cmaster.h" @@ -100,7 +100,7 @@ int16_t tmp102_read_temp_x100(); /* -------------------------------------------------------------------------- */ -#endif /* ifndef __TMP102_H__ */ +#endif /* ifndef TMP102_H_ */ diff --git a/platform/z1/dev/z1-phidgets.h b/platform/z1/dev/z1-phidgets.h index 8edf3498d..f56356508 100644 --- a/platform/z1/dev/z1-phidgets.h +++ b/platform/z1/dev/z1-phidgets.h @@ -36,8 +36,8 @@ * Updated : $Date: 2010/08/27 12:58:57 $ * $Revision: 1.2 $ */ -#ifndef __Z1_PHIDGETS_H__ -#define __Z1_PHIDGETS_H__ +#ifndef Z1_PHIDGETS_H_ +#define Z1_PHIDGETS_H_ #define PHIDGET5V_1 0 #define PHIDGET5V_2 1 @@ -46,4 +46,4 @@ extern const struct sensors_sensor phidgets; -#endif /* __Z1_PHIDGETS_H__ */ +#endif /* Z1_PHIDGETS_H_ */ diff --git a/platform/z1/platform-conf.h b/platform/z1/platform-conf.h index ed46991b5..28a17d17d 100644 --- a/platform/z1/platform-conf.h +++ b/platform/z1/platform-conf.h @@ -34,8 +34,8 @@ * Joakim Eriksson */ -#ifndef __PLATFORM_CONF_H__ -#define __PLATFORM_CONF_H__ +#ifndef PLATFORM_CONF_H_ +#define PLATFORM_CONF_H_ /* * Definitions below are dictated by the hardware and not really @@ -227,4 +227,4 @@ typedef unsigned long off_t; #define CC2420_SPI_DISABLE() (CC2420_CSN_PORT(OUT) |= BV(CC2420_CSN_PIN)) #define CC2420_SPI_IS_ENABLED() ((CC2420_CSN_PORT(OUT) & BV(CC2420_CSN_PIN)) != BV(CC2420_CSN_PIN)) -#endif /* __PLATFORM_CONF_H__ */ +#endif /* PLATFORM_CONF_H_ */ diff --git a/platform/z1sp/dev/potentiometer-sensor.h b/platform/z1sp/dev/potentiometer-sensor.h index 93e5a968a..d9d8b983d 100644 --- a/platform/z1sp/dev/potentiometer-sensor.h +++ b/platform/z1sp/dev/potentiometer-sensor.h @@ -34,8 +34,8 @@ * $Revision: 1.0 $ */ -#ifndef __POTENTIOMETER_SENSOR_H__ -#define __POTENTIOMETER_SENSOR_H__ +#ifndef POTENTIOMETER_SENSOR_H_ +#define POTENTIOMETER_SENSOR_H_ #include "lib/sensors.h" @@ -43,4 +43,4 @@ extern const struct sensors_sensor potentiometer_sensor; #define POTENTIOMETER_SENSOR "Potentiometer" -#endif /* __POTENTIOMETER_SENSOR_H__ */ +#endif /* POTENTIOMETER_SENSOR_H_ */ diff --git a/platform/z1sp/platform-conf.h b/platform/z1sp/platform-conf.h index aae55d639..677942302 100644 --- a/platform/z1sp/platform-conf.h +++ b/platform/z1sp/platform-conf.h @@ -34,8 +34,8 @@ * Joakim Eriksson */ -#ifndef __PLATFORM_CONF_H__ -#define __PLATFORM_CONF_H__ +#ifndef PLATFORM_CONF_H_ +#define PLATFORM_CONF_H_ /* * Definitions below are dictated by the hardware and not really @@ -225,4 +225,4 @@ typedef unsigned long off_t; #define CC2420_SPI_DISABLE() (CC2420_CSN_PORT(OUT) |= BV(CC2420_CSN_PIN)) #define CC2420_SPI_IS_ENABLED() ((CC2420_CSN_PORT(OUT) & BV(CC2420_CSN_PIN)) != BV(CC2420_CSN_PIN)) -#endif /* __PLATFORM_CONF_H__ */ +#endif /* PLATFORM_CONF_H_ */ diff --git a/tools/cooja/examples/project_new_interface/dummy_intf.h b/tools/cooja/examples/project_new_interface/dummy_intf.h index 0f8ec70cd..f6aeea4e7 100644 --- a/tools/cooja/examples/project_new_interface/dummy_intf.h +++ b/tools/cooja/examples/project_new_interface/dummy_intf.h @@ -28,12 +28,12 @@ * */ -#ifndef __DUMMY_INTF_H__ -#define __DUMMY_INTF_H__ +#ifndef DUMMY_INTF_H_ +#define DUMMY_INTF_H_ // Interface needs to include something? #define DUMMY_NR_1 1 #define DUMMY_NR_2 2 -#endif /* __DUMMY_INTF_H__ */ +#endif /* DUMMY_INTF_H_ */ diff --git a/tools/sky/uip6-bridge/bridge-conf.h b/tools/sky/uip6-bridge/bridge-conf.h index d96707863..86244d28d 100644 --- a/tools/sky/uip6-bridge/bridge-conf.h +++ b/tools/sky/uip6-bridge/bridge-conf.h @@ -36,8 +36,8 @@ * Joakim Eriksson */ -#ifndef __BRIDGE_CONF_H__ -#define __BRIDGE_CONF_H__ +#ifndef BRIDGE_CONF_H_ +#define BRIDGE_CONF_H_ #undef UIP_CONF_ROUTER @@ -51,4 +51,4 @@ #undef UIP_CONF_BUFFER_SIZE #define UIP_CONF_BUFFER_SIZE 256 -#endif /* __BRIDGE_CONF_H__ */ +#endif /* BRIDGE_CONF_H_ */ diff --git a/tools/sky/uip6-bridge/dev/slip.h b/tools/sky/uip6-bridge/dev/slip.h index 755b1d4c4..099c35111 100644 --- a/tools/sky/uip6-bridge/dev/slip.h +++ b/tools/sky/uip6-bridge/dev/slip.h @@ -31,8 +31,8 @@ * */ -#ifndef __SLIP_H__ -#define __SLIP_H__ +#ifndef SLIP_H_ +#define SLIP_H_ #include "contiki.h" @@ -89,4 +89,4 @@ void slip_set_tcpip_input_callback(void (*callback)(void)); void slip_arch_init(unsigned long ubr); void slip_arch_writeb(unsigned char c); -#endif /* __SLIP_H__ */ +#endif /* SLIP_H_ */ diff --git a/tools/stm32w/uip6_bridge/bridge-conf.h b/tools/stm32w/uip6_bridge/bridge-conf.h index 30deec66e..22ef7a556 100644 --- a/tools/stm32w/uip6_bridge/bridge-conf.h +++ b/tools/stm32w/uip6_bridge/bridge-conf.h @@ -36,8 +36,8 @@ * Joakim Eriksson */ -#ifndef __BRIDGE_CONF_H__ -#define __BRIDGE_CONF_H__ +#ifndef BRIDGE_CONF_H_ +#define BRIDGE_CONF_H_ #undef WITH_RIME #define WITH_RIME 0 @@ -61,4 +61,4 @@ #define RADIO_RXBUFS 15 -#endif /* __BRIDGE_CONF_H__ */ +#endif /* BRIDGE_CONF_H_ */ diff --git a/tools/stm32w/uip6_bridge/dev/slip.h b/tools/stm32w/uip6_bridge/dev/slip.h index 755b1d4c4..099c35111 100644 --- a/tools/stm32w/uip6_bridge/dev/slip.h +++ b/tools/stm32w/uip6_bridge/dev/slip.h @@ -31,8 +31,8 @@ * */ -#ifndef __SLIP_H__ -#define __SLIP_H__ +#ifndef SLIP_H_ +#define SLIP_H_ #include "contiki.h" @@ -89,4 +89,4 @@ void slip_set_tcpip_input_callback(void (*callback)(void)); void slip_arch_init(unsigned long ubr); void slip_arch_writeb(unsigned char c); -#endif /* __SLIP_H__ */ +#endif /* SLIP_H_ */ diff --git a/tools/stm32w/wpcapslip6/contiki-conf.h b/tools/stm32w/wpcapslip6/contiki-conf.h index 1ca2c97c2..020cbdfec 100644 --- a/tools/stm32w/wpcapslip6/contiki-conf.h +++ b/tools/stm32w/wpcapslip6/contiki-conf.h @@ -1,5 +1,5 @@ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ #include #define CCIF #define CLIF @@ -17,4 +17,4 @@ typedef unsigned short uip_stats_t; typedef unsigned long clock_time_t; #define CLOCK_CONF_SECOND 1000 -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/tools/stm32w/wpcapslip6/rtimer-arch.h b/tools/stm32w/wpcapslip6/rtimer-arch.h index 1b5322b4b..66f7b72c9 100644 --- a/tools/stm32w/wpcapslip6/rtimer-arch.h +++ b/tools/stm32w/wpcapslip6/rtimer-arch.h @@ -1,5 +1,5 @@ -#ifndef __RTIMER_ARCH_H__ -#define __RTIMER_ARCH_H__ +#ifndef RTIMER_ARCH_H_ +#define RTIMER_ARCH_H_ -#endif /* __RTIMER_ARCH_H__ */ +#endif /* RTIMER_ARCH_H_ */ diff --git a/tools/wpcapslip/contiki-conf.h b/tools/wpcapslip/contiki-conf.h index 1ca2c97c2..020cbdfec 100644 --- a/tools/wpcapslip/contiki-conf.h +++ b/tools/wpcapslip/contiki-conf.h @@ -1,5 +1,5 @@ -#ifndef __CONTIKI_CONF_H__ -#define __CONTIKI_CONF_H__ +#ifndef CONTIKI_CONF_H_ +#define CONTIKI_CONF_H_ #include #define CCIF #define CLIF @@ -17,4 +17,4 @@ typedef unsigned short uip_stats_t; typedef unsigned long clock_time_t; #define CLOCK_CONF_SECOND 1000 -#endif /* __CONTIKI_CONF_H__ */ +#endif /* CONTIKI_CONF_H_ */ diff --git a/tools/z80/hex2bin/src/ihx2bin.h b/tools/z80/hex2bin/src/ihx2bin.h index ee2cc29ae..e84071868 100644 --- a/tools/z80/hex2bin/src/ihx2bin.h +++ b/tools/z80/hex2bin/src/ihx2bin.h @@ -35,8 +35,8 @@ * @author Takahide Matsutsuka */ -#ifndef __IHX2BIN_H__ -#define __IHX2BIN_H__ +#ifndef IHX2BIN_H_ +#define IHX2BIN_H_ #define DEF_MAX 1024 #define DEF_NAMELEN 256 @@ -61,4 +61,4 @@ struct ConvertInfo { // int ihx2bin(FILE* dst, const char *src, unsigned char verbose); int ihx2bin(struct ConvertInfo* info); -#endif /* __IHX2BIN_H__ */ +#endif /* IHX2BIN_H_ */