Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Anders Blomdell
LabComm
Commits
32e47b82
Commit
32e47b82
authored
Feb 17, 2015
by
Sven Gestegård Robertz
Browse files
Merge branch 'typedefs' of gitlab.control.lth.se:anders_blomdell/labcomm into typedefs
parents
019e5a77
bb99f89d
Changes
10
Show whitespace changes
Inline
Side-by-side
lib/Makefile
View file @
32e47b82
.PHONY
:
all
all
:
cd
c
;
make
cd
csharp
;
make
cd
java
;
make
.PHONY
:
test
test
:
$(MAKE)
-C
c
test
.PHONY
:
clean
clean
:
cd
c
;
make
clean
cd
csharp
;
make
clean
cd
java
;
make
clean
$(MAKE)
-C
c
clean
$(MAKE)
-C
csharp
clean
$(MAKE)
-C
java
clean
$(MAKE)
-C
python clean
.PHONY
:
distclean
distclean
:
cd
c
;
make
distclean
cd
csharp
;
make
clean
cd
java
;
make
clean
$(MAKE)
-C
python clean
$(MAKE)
-C
c
distclean
$(MAKE)
-C
csharp
dist
clean
$(MAKE)
-C
java dist
clean
$(MAKE)
-C
python
dist
clean
lib/c/2006/labcomm2006_ioctl.h
View file @
32e47b82
...
...
@@ -84,23 +84,14 @@
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_NONE,type,nr,0)
#define LABCOMM_IOR(type,nr,size) \
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_READ,type,nr,sizeof(size))
/* FIXME: add flag to differentiate between size and nargs */
#define LABCOMM_IORN(type,nr,nargs) \
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_READ,type,nr,nargs)
#define LABCOMM_IOW(type,nr,size) \
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_WRITE,type,nr,sizeof(size))
#define LABCOMM_IOWN(type,nr,nargs) \
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_WRITE,type,nr,nargs)
#define LABCOMM_IOS(type,nr) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_READ,type,nr,0)
#define LABCOMM_IOSR(type,nr,size) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_READ,type,nr,sizeof(size))
#define LABCOMM_IOSRN(type,nr,nargs) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_READ,type,nr,nargs)
#define LABCOMM_IOSW(type,nr,size) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_WRITE,type,nr,sizeof(size))
#define LABCOMM_IOSWN(type,nr,nargs) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_WRITE,type,nr,nargs)
#define LABCOMM_IOCTL_WRITER_GET_BYTES_WRITTEN \
LABCOMM_IOR(0,1,int)
...
...
lib/c/2014/labcomm_ioctl.h
View file @
32e47b82
...
...
@@ -84,23 +84,14 @@
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_NONE,type,nr,0)
#define LABCOMM_IOR(type,nr,size) \
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_READ,type,nr,sizeof(size))
/* FIXME: add flag to differentiate between size and nargs */
#define LABCOMM_IORN(type,nr,nargs) \
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_READ,type,nr,nargs)
#define LABCOMM_IOW(type,nr,size) \
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_WRITE,type,nr,sizeof(size))
#define LABCOMM_IOWN(type,nr,nargs) \
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_WRITE,type,nr,nargs)
#define LABCOMM_IOS(type,nr) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_READ,type,nr,0)
#define LABCOMM_IOSR(type,nr,size) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_READ,type,nr,sizeof(size))
#define LABCOMM_IOSRN(type,nr,nargs) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_READ,type,nr,nargs)
#define LABCOMM_IOSW(type,nr,size) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_WRITE,type,nr,sizeof(size))
#define LABCOMM_IOSWN(type,nr,nargs) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_WRITE,type,nr,nargs)
#define LABCOMM_IOCTL_WRITER_GET_BYTES_WRITTEN \
LABCOMM_IOR(0,1,int)
...
...
lib/csharp/LabComm.csproj
deleted
100644 → 0
View file @
019e5a77
<?xml version="1.0" encoding="utf-8"?>
<Project
ToolsVersion=
"4.0"
DefaultTargets=
"Build"
xmlns=
"http://schemas.microsoft.com/developer/msbuild/2003"
>
<PropertyGroup>
<OutputType>
Library
</OutputType>
<AssemblyName>
LabComm
</AssemblyName>
<ProjectGuid>
{755CD5A6-C48E-4D35-B0BE-8EC0FDE1A2A1}
</ProjectGuid>
<!-- Properties which affect the build process -->
</PropertyGroup>
<PropertyGroup
Condition=
"'$(Configuration)' == 'Debug'"
>
<OutputPath>
bin\Debug\
</OutputPath>
</PropertyGroup>
<ItemGroup>
<Compile
Include=
"se\lth\control\labcomm\LabCommDispatcher.cs"
/>
<Compile
Include=
"se\lth\control\labcomm\LabCommDecoderRegistry.cs"
/>
<Compile
Include=
"se\lth\control\labcomm\LabComm.cs"
/>
<Compile
Include=
"se\lth\control\labcomm\LabCommSample.cs"
/>
<Compile
Include=
"se\lth\control\labcomm\LabCommHandler.cs"
/>
<Compile
Include=
"se\lth\control\labcomm\LabCommEncoderRegistry.cs"
/>
<Compile
Include=
"se\lth\control\labcomm\LabCommDecoder.cs"
/>
<Compile
Include=
"se\lth\control\labcomm\LabCommType.cs"
/>
<Compile
Include=
"se\lth\control\labcomm\LabCommEncoderChannel.cs"
/>
<Compile
Include=
"se\lth\control\labcomm\LabCommEncoder.cs"
/>
<Compile
Include=
"se\lth\control\labcomm\LabCommDecoderChannel.cs"
/>
</ItemGroup>
<Import
Project=
"$(MSBuildToolsPath)\Microsoft.CSharp.targets"
/>
</Project>
\ No newline at end of file
lib/csharp/Makefile
View file @
32e47b82
...
...
@@ -16,4 +16,6 @@ labcomm.dll: $(MODULES:%=se/lth/control/labcomm/%.cs) Makefile
mcs
-out
:
$@
-target
:library
$(
filter
%.cs,
$^
)
clean
:
distclean
:
rm
-f
labcomm.dll
lib/java/Makefile
View file @
32e47b82
...
...
@@ -20,31 +20,38 @@ MODULES=Constant \
all
:
labcomm.jar labcomm2014.jar labcomm2006.jar
labcomm.jar
:
gen/JAVAC
labcomm.jar
:
gen/JAVAC
osgi-manifest-all.txt
echo
$@
cd
gen
;
jar cfm ../
$@
../osgi-manifest.txt se/lth/control/labcomm/
*
.class se/lth/control/labcomm2006/
*
.class
cd
gen
;
jar cfm ../
$@
../osgi-manifest-all.txt
\
se/lth/control/labcomm/
*
.class
\
se/lth/control/labcomm2006/
*
.class
labcomm2014.jar
:
gen/JAVAC
labcomm2014.jar
:
gen/JAVAC
osgi-manifest-2014.txt
echo
$@
cd
gen
;
jar cfm ../
$@
../osgi-manifest.txt se/lth/control/labcomm/
*
.class
cd
gen
;
jar cfm ../
$@
../osgi-manifest-2014.txt
\
se/lth/control/labcomm/
*
.class
labcomm2006.jar
:
gen/JAVAC
labcomm2006.jar
:
gen/JAVAC
osgi-manifest-2006.txt
echo
$@
cd
gen
;
jar cfm ../
$@
../osgi-manifest.txt se/lth/control/labcomm2006/
*
.class
cd
gen
;
jar cfm ../
$@
../osgi-manifest-2006.txt
\
se/lth/control/labcomm2006/
*
.class
gen
:
mkdir
gen
gen/JAVAC
:
$(MODULES:%=se/lth/control/labcomm/%.java) $(MODULES:%=se/lth/control/labcomm2006/%.java) Makefile | gen
javac
-cp
../../compiler/labcomm_compiler.jar
-d
gen
$(
filter
%.java,
$^
)
gen/JAVAC
:
$(MODULES:%=se/lth/control/labcomm/%.java)
\
$(MODULES:%=se/lth/control/labcomm2006/%.java)
\
Makefile | gen
javac
-cp
../../compiler/labcomm_compiler.jar
-d
gen
\
$(
filter
%.java,
$^
)
touch
$@
.PHONY
:
clean
clean
:
rm
-rf
labcomm.jar labcomm2006.jar labcomm2014.jar
gen
rm
-rf
gen
.PHONY
:
distclean
distclean
:
rm
-rf
labcomm.jar labcomm2006.jar labcomm2014.jar
distclean
:
clean
lib/java/osgi-manifest.txt
→
lib/java/osgi-manifest
-2006
.txt
View file @
32e47b82
Bundle-Description: Provides Labcomm to bundles
Bundle-ManifestVersion: 2
Bundle-Name: Labcomm OSGi
Bundle-SymbolicName: se.lth.control.labcomm
Bundle-SymbolicName: se.lth.control.labcomm
2006
Bundle-Vendor: LTH
Bundle-Version: 1.0.0
Export-Package: se.lth.control.labcomm;version="1.0.0",se.lth.control.la
bcomm2006;version="1.0.0"
Export-Package: se.lth.control.labcomm2006;version="1.0.0"
lib/java/osgi-manifest-2014.txt
0 → 100644
View file @
32e47b82
Bundle-Description: Provides Labcomm 2014 to bundles
Bundle-ManifestVersion: 2
Bundle-Name: Labcomm OSGi
Bundle-SymbolicName: se.lth.control.labcomm2014
Bundle-Vendor: LTH
Bundle-Version: 1.0.0
Export-Package: se.lth.control.labcomm;version="1.0.0"
lib/java/osgi-manifest-all.txt
0 → 100644
View file @
32e47b82
Bundle-Description: Provides Labcomm 2006/2014 to bundles
Bundle-ManifestVersion: 2
Bundle-Name: Labcomm OSGi
Bundle-SymbolicName: se.lth.control.labcomm-all
Bundle-Vendor: LTH
Bundle-Version: 1.0.0
Export-Package: se.lth.control.labcomm2006;version="1.0.0",
se.lth.control.labcomm;version="1.0.0"
lib/python/Makefile
View file @
32e47b82
.PHONY
:
clean
clean
:
find
.
-name
'*.pyc'
-exec
rm
{}
\;
distclean
:
find
.
-name
'*.pyc'
-exec
rm
{}
\;
.PHONY
:
distclean
distclean
:
clean
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment