Diffstat (limited to 'noncore/settings/networksettings2/usb') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/usb/usb.pro | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings2/usb/usb_NN.cpp | 15 | ||||
-rw-r--r-- | noncore/settings/networksettings2/usb/usb_NNI.cpp | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/noncore/settings/networksettings2/usb/usb.pro b/noncore/settings/networksettings2/usb/usb.pro index 37c1bde..d9890b6 100644 --- a/noncore/settings/networksettings2/usb/usb.pro +++ b/noncore/settings/networksettings2/usb/usb.pro | |||
@@ -1,8 +1,8 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release plugin |
3 | DESTDIR = $(OPIEDIR)/plugins/networksettings2 | 3 | DESTDIR = $(OPIEDIR)/plugins/networksettings2 |
4 | HEADERS = usb_NN.h \ | 4 | HEADERS = usb_NN.h \ |
5 | usb_NNI.h \ | 5 | usb_NNI.h \ |
6 | usbedit.h | 6 | usbedit.h |
7 | SOURCES = usb_NN.cpp \ | 7 | SOURCES = usb_NN.cpp \ |
8 | usb_NNI.cpp \ | 8 | usb_NNI.cpp \ |
diff --git a/noncore/settings/networksettings2/usb/usb_NN.cpp b/noncore/settings/networksettings2/usb/usb_NN.cpp index bd9ae2b..9c07b82 100644 --- a/noncore/settings/networksettings2/usb/usb_NN.cpp +++ b/noncore/settings/networksettings2/usb/usb_NN.cpp | |||
@@ -1,10 +1,16 @@ | |||
1 | #include <resources.h> | 1 | #include <resources.h> |
2 | #include "usb_NN.h" | 2 | #include "usb_NN.h" |
3 | #include "usb_NNI.h" | 3 | #include "usb_NNI.h" |
4 | 4 | ||
5 | #ifndef MYPLUGIN | ||
6 | |||
7 | #include "netnodeinterface.h" | ||
8 | |||
9 | #endif | ||
10 | |||
5 | static const char * USBNeeds[] = | 11 | static const char * USBNeeds[] = |
6 | { 0 | 12 | { 0 |
7 | }; | 13 | }; |
8 | 14 | ||
9 | static const char * USBProvides[] = | 15 | static const char * USBProvides[] = |
10 | { "device", | 16 | { "device", |
@@ -52,11 +58,20 @@ QString USBNetNode::genNic( long ) { | |||
52 | void USBNetNode::setSpecificAttribute( QString & , QString & ) { | 58 | void USBNetNode::setSpecificAttribute( QString & , QString & ) { |
53 | } | 59 | } |
54 | 60 | ||
55 | void USBNetNode::saveSpecificAttribute( QTextStream & ) { | 61 | void USBNetNode::saveSpecificAttribute( QTextStream & ) { |
56 | } | 62 | } |
57 | 63 | ||
64 | #ifdef MYPLUGIN | ||
65 | |||
58 | extern "C" { | 66 | extern "C" { |
59 | void create_plugin( QList<ANetNode> & PNN ) { | 67 | void create_plugin( QList<ANetNode> & PNN ) { |
60 | PNN.append( new USBNetNode() ); | 68 | PNN.append( new USBNetNode() ); |
61 | } | 69 | } |
70 | |||
71 | #else | ||
72 | |||
73 | OPIE_NS2_PLUGIN( NetNodeInterface<USBNetNode> ) | ||
74 | |||
75 | #endif | ||
76 | |||
62 | } | 77 | } |
diff --git a/noncore/settings/networksettings2/usb/usb_NNI.cpp b/noncore/settings/networksettings2/usb/usb_NNI.cpp index 600b771..424845c 100644 --- a/noncore/settings/networksettings2/usb/usb_NNI.cpp +++ b/noncore/settings/networksettings2/usb/usb_NNI.cpp | |||
@@ -42,13 +42,13 @@ short AUSB::generateFileEmbedded( SystemFile & SF, | |||
42 | 42 | ||
43 | if( SF.name() == "interfaces" ) { | 43 | if( SF.name() == "interfaces" ) { |
44 | Log(("Generate USB for %s\n", SF.name().latin1() )); | 44 | Log(("Generate USB for %s\n", SF.name().latin1() )); |
45 | // generate mapping stanza for this interface | 45 | // generate mapping stanza for this interface |
46 | SF << " pre-up " | 46 | SF << " pre-up " |
47 | << QPEApplication::qpeDir() | 47 | << QPEApplication::qpeDir() |
48 | << "bin/setmacaddress.sh " | 48 | << "bin/NS2SetMac.sh " |
49 | << NIC | 49 | << NIC |
50 | << " || true" | 50 | << " || true" |
51 | << endl; | 51 | << endl; |
52 | rvl = 0; | 52 | rvl = 0; |
53 | } | 53 | } |
54 | rvd = ANetNodeInstance::generateFileEmbedded(SF, DevNr ); | 54 | rvd = ANetNodeInstance::generateFileEmbedded(SF, DevNr ); |