author | mickeyl <mickeyl> | 2005-05-03 14:06:40 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-05-03 14:06:40 (UTC) |
commit | a0da10e78110fe3b291f4d2d3956bf6003ca2d2a (patch) (unidiff) | |
tree | 8b902cdc88d4c196971c7a925aa3e7dfc2215c54 | |
parent | 8dc5378786b26d847e4771129760ccb76f04c40f (diff) | |
download | opie-a0da10e78110fe3b291f4d2d3956bf6003ca2d2a.zip opie-a0da10e78110fe3b291f4d2d3956bf6003ca2d2a.tar.gz opie-a0da10e78110fe3b291f4d2d3956bf6003ca2d2a.tar.bz2 |
GET_LINK_QUALITY_RP_SIZE has been renamed to READ_LINK_QUALITY_RP_SIZE in newer versions of bluez
-rw-r--r-- | noncore/settings/networksettings2/opietooth2/OTDriver.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/noncore/settings/networksettings2/opietooth2/OTDriver.cpp b/noncore/settings/networksettings2/opietooth2/OTDriver.cpp index cfd0491..dbc9b97 100644 --- a/noncore/settings/networksettings2/opietooth2/OTDriver.cpp +++ b/noncore/settings/networksettings2/opietooth2/OTDriver.cpp | |||
@@ -1,64 +1,66 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | * Copyright (C) 2003 by Mattia Merzi * | 2 | * Copyright (C) 2003 by Mattia Merzi * |
3 | * ottobit@ferrara.linux.it * | 3 | * ottobit@ferrara.linux.it * |
4 | * * | 4 | * * |
5 | * This program is free software; you can redistribute it and/or modify * | 5 | * This program is free software; you can redistribute it and/or modify * |
6 | * it under the terms of the GNU General Public License as published by * | 6 | * it under the terms of the GNU General Public License as published by * |
7 | * the Free Software Foundation; either version 2 of the License, or * | 7 | * the Free Software Foundation; either version 2 of the License, or * |
8 | * (at your option) any later version. * | 8 | * (at your option) any later version. * |
9 | ***************************************************************************/ | 9 | ***************************************************************************/ |
10 | 10 | ||
11 | #include <opie2/odebug.h> | 11 | #include <opie2/odebug.h> |
12 | #include <qtimer.h> | 12 | #include <qtimer.h> |
13 | 13 | ||
14 | #include <sys/poll.h> | 14 | #include <sys/poll.h> |
15 | #include <bluezlib.h> | 15 | #include <bluezlib.h> |
16 | 16 | #ifndef GET_LINK_QUALITY_RP_SIZE | |
17 | #define GET_LINK_QUALITY_RP_SIZE READ_LINK_QUALITY_RP_SIZE | ||
18 | #endif | ||
17 | #include <OTGateway.h> | 19 | #include <OTGateway.h> |
18 | #include <OTDriver.h> | 20 | #include <OTDriver.h> |
19 | #include <OTHCISocket.h> | 21 | #include <OTHCISocket.h> |
20 | 22 | ||
21 | using namespace Opietooth2; | 23 | using namespace Opietooth2; |
22 | 24 | ||
23 | static struct { | 25 | static struct { |
24 | const char *str; | 26 | const char *str; |
25 | unsigned short rev; | 27 | unsigned short rev; |
26 | } csr_map[] = { | 28 | } csr_map[] = { |
27 | { "HCI 11.2 (bc01b)", 114 }, | 29 | { "HCI 11.2 (bc01b)", 114 }, |
28 | { "HCI 11.3 (bc01b)", 115 }, | 30 | { "HCI 11.3 (bc01b)", 115 }, |
29 | { "HCI 12.1 (bc01b)", 119 }, | 31 | { "HCI 12.1 (bc01b)", 119 }, |
30 | { "HCI 12.3 (bc01b)", 134 }, | 32 | { "HCI 12.3 (bc01b)", 134 }, |
31 | { "HCI 12.7 (bc01b)", 188 }, | 33 | { "HCI 12.7 (bc01b)", 188 }, |
32 | { "HCI 12.8 (bc01b)", 218 }, | 34 | { "HCI 12.8 (bc01b)", 218 }, |
33 | { "HCI 12.9 (bc01b)", 283 }, | 35 | { "HCI 12.9 (bc01b)", 283 }, |
34 | { "HCI 13.10 (bc01b)", 309 }, | 36 | { "HCI 13.10 (bc01b)", 309 }, |
35 | { "HCI 13.11 (bc01b)", 351 }, | 37 | { "HCI 13.11 (bc01b)", 351 }, |
36 | { "HCI 16.4 (bc01b)", 523 }, | 38 | { "HCI 16.4 (bc01b)", 523 }, |
37 | { "HCI 14.3 (bc02x)", 272 }, | 39 | { "HCI 14.3 (bc02x)", 272 }, |
38 | { "HCI 14.6 (bc02x)", 336 }, | 40 | { "HCI 14.6 (bc02x)", 336 }, |
39 | { "HCI 14.7 (bc02x)", 373 }, | 41 | { "HCI 14.7 (bc02x)", 373 }, |
40 | { "HCI 14.8 (bc02x)", 487 }, | 42 | { "HCI 14.8 (bc02x)", 487 }, |
41 | { "HCI 15.3 (bc02x)", 443 }, | 43 | { "HCI 15.3 (bc02x)", 443 }, |
42 | { "HCI 16.4 (bc02x)", 525 }, | 44 | { "HCI 16.4 (bc02x)", 525 }, |
43 | { NULL, 0} | 45 | { NULL, 0} |
44 | }; | 46 | }; |
45 | 47 | ||
46 | static char *services[] = { "Positioning", | 48 | static char *services[] = { "Positioning", |
47 | "Networking", | 49 | "Networking", |
48 | "Rendering", | 50 | "Rendering", |
49 | "Capturing", | 51 | "Capturing", |
50 | "Object Transfer", | 52 | "Object Transfer", |
51 | "Audio", | 53 | "Audio", |
52 | "Telephony", | 54 | "Telephony", |
53 | "Information" }; | 55 | "Information" }; |
54 | 56 | ||
55 | static char *major_devices[] = { "Miscellaneous", | 57 | static char *major_devices[] = { "Miscellaneous", |
56 | "Computer", | 58 | "Computer", |
57 | "Phone", | 59 | "Phone", |
58 | "LAN Access", | 60 | "LAN Access", |
59 | "Audio/Video", | 61 | "Audio/Video", |
60 | "Peripheral", | 62 | "Peripheral", |
61 | "Imaging", | 63 | "Imaging", |
62 | "Uncategorized" }; | 64 | "Uncategorized" }; |
63 | 65 | ||
64 | 66 | ||