Diffstat (limited to 'noncore/settings/networksettings2/usb/usb_NNI.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/usb/usb_NNI.cpp | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/noncore/settings/networksettings2/usb/usb_NNI.cpp b/noncore/settings/networksettings2/usb/usb_NNI.cpp index e90204c..50c6e8d 100644 --- a/noncore/settings/networksettings2/usb/usb_NNI.cpp +++ b/noncore/settings/networksettings2/usb/usb_NNI.cpp | |||
@@ -32,21 +32,30 @@ void AUSB::commit( void ) { | |||
32 | } | 32 | } |
33 | } | 33 | } |
34 | 34 | ||
35 | bool AUSB::hasDataFor( const QString & S ) { | 35 | short AUSB::generateFileEmbedded( const QString & ID, |
36 | return (S== "interfaces"); | 36 | const QString & Path, |
37 | } | 37 | QTextStream & TS, |
38 | 38 | long DevNr ) { | |
39 | bool AUSB::generateDataForCommonFile( SystemFile & S, long DevNr ) { | 39 | |
40 | QString NIC = runtime()->device()->netNode()->nodeClass()->genNic( DevNr ); | 40 | QString NIC = runtime()->device()->netNode()->nodeClass()->genNic( DevNr ); |
41 | short rvl, rvd; | ||
42 | |||
43 | rvl = 1; | ||
41 | 44 | ||
42 | if( S.name() == "interfaces" ) { | 45 | if( ID == "interfaces" ) { |
46 | Log(("Generate USB for %s\n", ID.latin1() )); | ||
43 | // generate mapping stanza for this interface | 47 | // generate mapping stanza for this interface |
44 | S << " pre-up " | 48 | TS << " pre-up " |
45 | << QPEApplication::qpeDir() | 49 | << QPEApplication::qpeDir() |
46 | << "bin/setmacaddress.sh " | 50 | << "bin/setmacaddress.sh " |
47 | << NIC | 51 | << NIC |
48 | << " || true" | 52 | << " || true" |
49 | << endl; | 53 | << endl; |
54 | rvl = 0; | ||
50 | } | 55 | } |
51 | return 0; | 56 | rvd = ANetNodeInstance::generateFileEmbedded( ID, Path, TS, DevNr ); |
57 | |||
58 | return (rvd == 2 || rvl == 2 ) ? 2 : | ||
59 | (rvd == 0 || rvl == 0 ) ? 0 : 1; | ||
60 | |||
52 | } | 61 | } |