From b730a3820131a7614fe836bc39a0b18b375d5251 Mon Sep 17 00:00:00 2001 From: otvi Date: Thu, 23 Oct 2008 14:13:04 +0000 Subject: [PATCH] - macOld --> mac, also in the ned file - fix layout of make menu (both in makefrag and makefile; does the makefrag still have any purpose at all now?) git-svn-id: https://mixim.svn.sourceforge.net/svnroot/mixim/trunk@461 ccb5d51d-3e1d-0410-9886-bf3c9037c363 --- Makefile | 6 +++--- makefrag | 22 +++++++++++----------- modules/mac/Mac.ned | 27 ++++++++++++++------------- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index d26529feb..716568075 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,11 @@ help: @echo " modules -- create modules" @echo " lib -- create mixim library (base and modules)" @echo " examples -- create example networks " - @echo " configurator -- create the configuration tool " + @echo " configurator -- create the configuration tool " @echo " tests -- create tests " - @echo " all -- create all of the above " + @echo " all -- create all of the above " @echo " docs -- create documentation " - @echo " clean -- clean everything up " + @echo " clean -- clean everything up " @echo " distclean -- get back to pristine fresh state " @echo "*******************************************************************" diff --git a/makefrag b/makefrag index 1d6f02313..3cbd99eda 100644 --- a/makefrag +++ b/makefrag @@ -7,17 +7,17 @@ help: @echo @echo "*******************************************************************" @echo " Targets are:" - @echo " base -- create base" - @echo " modules -- create modules" - @echo " lib -- create mixim library" - @echo " bin -- create mixim binary" - @echo " tests -- create tests " - @echo " examples -- create example networks " - @echo " configurator -- create the configuration tool " - @echo " all -- create all of the above " - @echo " docs -- create documentation " - @echo " clean -- clean everything up " - @echo " distclean -- get back to pristine fresh state " + @echo " base -- create base" + @echo " modules -- create modules" + @echo " lib -- create mixim library" + @echo " bin -- create mixim binary" + @echo " tests -- create tests " + @echo " examples -- create example networks " + @echo " configurator -- create the configuration tool " + @echo " all -- create all of the above " + @echo " docs -- create documentation " + @echo " clean -- clean everything up " + @echo " distclean -- get back to pristine fresh state " @echo "*******************************************************************" # make all diff --git a/modules/mac/Mac.ned b/modules/mac/Mac.ned index db0ef0fa8..c5fd3be12 100644 --- a/modules/mac/Mac.ned +++ b/modules/mac/Mac.ned @@ -1,19 +1,20 @@ -package org.mixim.modules.macOld; +package org.mixim.modules.mac; -simple EyesMacLayer -{ +simple EyesMacLayer { parameters: - bool debug; // debug switch - double headerLength; // length of the MAC packet header (in bits) + bool debug; // debug switch + double headerLength; // length of the MAC packet header (in bits) bool lpl; volatile double siftNodes; + gates: - input upperGateIn; // from the network layer - output upperGateOut; // to the network layer - input upperControlIn; // control from the network layer - output upperControlOut; // control to the network layer - input lowerGateIn; // from the physical layer - output lowerGateOut; // to the physical layer - input lowerControlIn; // control from the physical layer - output lowerControlOut; // control to the physical layer + input upperGateIn; // from the network layer + output upperGateOut; // to the network layer + input upperControlIn; // control from the network layer + output upperControlOut; // control to the network layer + input lowerGateIn; // from the physical layer + output lowerGateOut; // to the physical layer + input lowerControlIn; // control from the physical layer + output lowerControlOut; // control to the physical layer } +