Commit graph

161 commits

Author SHA1 Message Date
Roshan Pius
f7702fcfba wifi: Add support for multiple chips in IWifi
am: cd566bddd7

Change-Id: I474546e49179f63a1e65dd6f5281c21441f5228d
2016-10-11 20:49:04 +00:00
Roshan Pius
83090ab624 wifi(interface): Add RTT Controller object
am: fcbf923d3a

Change-Id: I511b158bf8bafb7dd54fec18941e35b14cec380f
2016-10-11 20:49:03 +00:00
Roshan Pius
68e09f0c35 wifi(interface): Add Iface objects
am: adcfba4b09

Change-Id: I429ea70427a09948ded4089856bda67303b6b075
2016-10-11 20:49:02 +00:00
Roshan Pius
cd566bddd7 wifi: Add support for multiple chips in IWifi
The modified HIDL interface supports multiple chip instances on the
device. Modify the |IWifi| interface implementation to support the new
methods.

NOTE: The legacy HAL implementation will continue to only expose 1 chip.

While there,
Change the |callbacks_| member to std::vector instead of std::set. We
don't really need a set to store the list of callbacks.

Bug: 32003988
Test: Compiles
Change-Id: I31e704100f716e223095890279bdf93d2a04377e
2016-10-11 07:46:24 -07:00
Roshan Pius
fcbf923d3a wifi(interface): Add RTT Controller object
Create a RTT controller object to use for initiating all the RTT related
HAL opertations.
Since we don't want to fix the iface on which to initiate RTT operations,
these methods will be rooted in a new standalone object |RttController|.
Framework can decide to intiate an instance of |RttController| on a
specified iface or let the implementation pick one.

Bug: 31991232
Test: Interface compiles.
Change-Id: I65f7a7babd72db26ce6549f572abd9ef73700c82
2016-10-11 07:46:24 -07:00
Roshan Pius
adcfba4b09 wifi(interface): Add Iface objects
Create a child object under IWifiChip to represent each interface
within the chip. Each iface object has a |type| & |ifname| which should
help us uniquely identify them. This should help us expose methods that
are applicable only to a specific interface type.

While there,
Assign a unique id to every chip on the device.
Add IWifi.listChipIds() to retrieve the list of chip Id's avaiable on the
device. IWifi.getChip() will now use the provided Id to retrieve the
corresponding IWifiChip object(because HIDL language doesn't support
vec<HIDL objects>).

Bug: 31943042
Bug: 32003988
Test: Interface compiles (not implementation)
Change-Id: I723007566ca4220362c02d0f452753fee4e31fce
2016-10-11 07:46:24 -07:00
Amit Mahajan
969b65155d Merge "Initial version of radio hal"
am: 2078f22513

Change-Id: I6ad9850af03e79c6be37fbc3d717c2f882812c4d
2016-10-11 00:02:18 +00:00
Treehugger Robot
2078f22513 Merge "Initial version of radio hal" 2016-10-10 23:53:11 +00:00
Amit Mahajan
4cb7b84aba Initial version of radio hal
Test: No build issues. Unused interface; nothing to test yet.

Bug: 32020264
Change-Id: Ie57eb43b777dadbc0b0350f2e33227be3f1d65f1
2016-10-10 14:36:50 -07:00
Yifan Hong
ccdc46999a Merge "Add test for importing a single type."
am: a543fe6ab0

Change-Id: Iada329b14b66825933f6b42b9eb259584276b9cd
2016-10-10 19:59:00 +00:00
Yifan Hong
a543fe6ab0 Merge "Add test for importing a single type." 2016-10-10 19:49:45 +00:00
Yifan Hong
55c8f5979f Add test for fixing 0XFF (upper X)
am: e312006887

Change-Id: I8aa7620f3acb68008ddd56c45d8cc2af596b310e
2016-10-08 10:42:31 +00:00
Yifan Hong
799ebcb7fa Add test for importing a single type.
Test: `cd system/tools/hidl && mma`

Bug: 31821285

Change-Id: I0be97b16b84f76b64c09f9dc52709416601cbbdf
2016-10-07 19:43:43 -07:00
Yifan Hong
e312006887 Add test for fixing 0XFF (upper X)
Bug: 31983995

Test: make android.hardware.tests.expression@1.0
Change-Id: I05bed0164c5cc988843a60d1efc8f5aeb4986b9b
2016-10-07 16:32:57 -07:00
Steven Moreland
56fb3ee908 Merge "Revert "Revert "Revert "nfc: reflect style guide.""""
am: 13e19421b3

Change-Id: I32627c1cadf883d5db0649bca3f8974388cd64ad
2016-10-06 02:57:30 +00:00
Steven Moreland
b947073aad Revert "Revert "Revert "nfc: update default implementation to match style."""
am: 6d4d412617

Change-Id: I0fdeaa060de1232ae43809ad3ae266e9b4cd67fd
2016-10-06 02:56:46 +00:00
Steven Moreland
77f08aaff0 Revert "Revert "Revert "nfc: reflect style guide."""
am: 20ea4ea288

Change-Id: I1113a2fb4d8647f11d5269ea59a487fa5466945f
2016-10-06 02:56:44 +00:00
Steven Moreland
13e19421b3 Merge "Revert "Revert "Revert "nfc: reflect style guide."""" 2016-10-06 02:51:18 +00:00
Steven Moreland
6d4d412617 Revert "Revert "Revert "nfc: update default implementation to match style."""
This reverts commit 22be21e864.

Change-Id: I0534b0eb87623091685fa0e2d94d744d2aeaa4ca
2016-10-06 02:50:58 +00:00
Steven Moreland
20ea4ea288 Revert "Revert "Revert "nfc: reflect style guide."""
This reverts commit 106bc9d27a.

Change-Id: Ie2e0ad4aeaa58c45bab05234615bd7fa02b84c1a
2016-10-06 02:50:48 +00:00
Yifan Hong
2c11d494b2 Merge "Add test for missing package name for FQName lookup."
am: e57188f95e

Change-Id: I28977cab5f679f420d8d4f9fa175d6c46a434373
2016-10-06 00:24:11 +00:00
Treehugger Robot
e57188f95e Merge "Add test for missing package name for FQName lookup." 2016-10-06 00:19:36 +00:00
Roshan Pius
5a225ae795 Merge changes from topic 'rename_wifi_hal'
am: 73e6598317

Change-Id: I57f299c01135271fa6fbb16d30d3ccf62c415b33
2016-10-05 23:39:04 +00:00
Roshan Pius
e12a119446 wifi(interface): Rename interface to iface
am: 271f2c2d9c

Change-Id: I623c387824deba3e883cf68c032a897ebcac907a
2016-10-05 23:39:02 +00:00
Roshan Pius
f5e1b72fac wifi(interface): Add/Correct docstring params
am: 6f31d92e59

Change-Id: Icf70fe64c660ec05d48054fe7ac01caccef65240
2016-10-05 23:39:01 +00:00
Roshan Pius
7397e8b933 wifi: Add implementation of driver/firmware memory dumps
am: cdb77f3cf2

Change-Id: I11fb9cc47f84a49b4a836da28266089f9971768c
2016-10-05 23:39:00 +00:00
Roshan Pius
28c1a422f2 wifi: Add Implementation of IWifiChip.requestChipDebugInfo
am: 4b26c832ed

Change-Id: I9c5f107d0978ee71a415e12fbb11efa8f616ead4
2016-10-05 23:38:59 +00:00
Roshan Pius
01f430f31f wifi: Use hal_tool & if_tool
am: 908a69a53a

Change-Id: I8b5260f1f02124ba71fb52b306f29f43d1d11d96
2016-10-05 23:38:58 +00:00
Roshan Pius
e9301b4c57 wifi: Restructure wifi legacy HAL implementation
am: aabe575536

Change-Id: I1414455e7a64efbfe1556a3e0e74370d54db340f
2016-10-05 23:38:56 +00:00
Roshan Pius
162f178af9 wifi: Change namespace
am: 79a9975d07

Change-Id: I00ad528928fdb6fad22dacb7658ce9dbf5817a2b
2016-10-05 23:38:55 +00:00
Roshan Pius
2e5f1858e4 wifi: Move legacy HAL implementation
am: 3c4e8a358c

Change-Id: I9b91ce2502601d2b3181b17a31273309ddfcf27c
2016-10-05 23:38:54 +00:00
Treehugger Robot
73e6598317 Merge changes from topic 'rename_wifi_hal'
* changes:
  wifi(interface): Rename interface to iface
  wifi(interface): Add/Correct docstring params
  wifi: Add implementation of driver/firmware memory dumps
  wifi: Add Implementation of IWifiChip.requestChipDebugInfo
  wifi: Use hal_tool & if_tool
  wifi: Restructure wifi legacy HAL implementation
  wifi: Change namespace
  wifi: Move legacy HAL implementation
2016-10-05 23:35:12 +00:00
Yifan Hong
b364daa90e Add test for vec<vec<T>> as a return value.
am: 223b82a07d

Change-Id: I95ad44aed3a42ad1d82e2f3e1b03da18012f0c6c
2016-10-05 22:51:19 +00:00
Yifan Hong
c5be5aca63 Add test for missing package name for FQName lookup.
Bug: 31705664

Test: `cd system/tools/hidl && mma`
Change-Id: If3568f1d1e77ad97ccfce5eac5938048f3852560
2016-10-05 15:50:28 -07:00
Yifan Hong
223b82a07d Add test for vec<vec<T>> as a return value.
Bug: 31955917

Test: hidl_test
Change-Id: I9ae7f9b04126261210cb4621266676727877d92f
2016-10-05 14:12:30 -07:00
Roshan Pius
271f2c2d9c wifi(interface): Rename interface to iface
The HIDL objects are called "interface", so rename the wifi interface to
iface to distinguish between them better.

This is especially needed in the follow up CL.

Bug: 31943042
Test: mmm -j32 hardware/interfaces/wifi/1.0/
Change-Id: I3bc34930f75159d26321c0e071af9084d0585508
2016-10-05 10:30:24 -07:00
Roshan Pius
6f31d92e59 wifi(interface): Add/Correct docstring params
Changes in the CL:
1. Add missing docstring params in the HIDL interface.
2. Reword some method docs. Occurences of "will" is replaced
by "must" (based on comments received on supplicant HIDL interface:
go/aog/275115).
3. Add onFailure callbacks for all the methods and added docstrings for
them.

Bug: 31352200
Test: mmma -j32 hardware/interfaces/wifi/1.0
Change-Id: Ib7152625851023d6244f742bb77a8fdc0829e00d
2016-10-05 10:30:15 -07:00
Steven Moreland
4484643519 Merge "Revert "Revert "nfc: update default implementation to match style."""
am: 67f700350a

Change-Id: I383cbfde9f5812fa0af02cc6419d25aea08ca4d5
2016-10-05 17:28:09 +00:00
Steven Moreland
22fa3244c7 Revert "Revert "nfc: reflect style guide.""
am: 106bc9d27a

Change-Id: I0d29f4064a8b4fc84fe5d3a4d09d94ad9854cccb
2016-10-05 17:28:08 +00:00
Treehugger Robot
67f700350a Merge "Revert "Revert "nfc: update default implementation to match style.""" 2016-10-05 17:22:30 +00:00
Roshan Pius
cdb77f3cf2 wifi: Add implementation of driver/firmware memory dumps
Bug: 31352200
Test: mmma -j32 hardware/interfaces/wifi/1.0/default
Change-Id: I25d42cfd4c2b1ea7e63bdc036f37f81aed93c565
2016-10-05 09:22:06 -07:00
Roshan Pius
4b26c832ed wifi: Add Implementation of IWifiChip.requestChipDebugInfo
Bug: 31352200
Test: mmma -j32 hardware/interfaces/wifi/1.0/default
Change-Id: Id0c02e37dac66de6f830785881cb67f113c0fb19
2016-10-05 09:21:07 -07:00
Steven Moreland
22be21e864 Revert "Revert "nfc: update default implementation to match style.""
This reverts commit 3768be324b.

Change-Id: Ifecd3ac227af14b49eba83c1126d51996ce3b8f5
2016-10-05 15:46:37 +00:00
Steven Moreland
106bc9d27a Revert "Revert "nfc: reflect style guide.""
This reverts commit 69bb15e06e.

Change-Id: Icd6ac819606c83e1518c4b6252f6416f55e618fd
2016-10-05 15:46:21 +00:00
Roshan Pius
908a69a53a wifi: Use hal_tool & if_tool
Changes in the CL:
1. Currently |WifiNative.cpp|, uses |hal_tool| to initialize the
function table and |if_tool| to set the interface up when |startHAL|
method is invoked. Use the same sequence in the HIDL'ized HAL.
2. Remove the assertion if the function table initialization fails. This
will result in a failure indication on starting the HAL now.

Bug: 31352200
Test: mmma -j32 hardware/interfaces/wifi/1.0/default
Change-Id: I268845ed62158b6a2ff36659f0bb15c4100a7222
2016-10-04 18:36:25 -07:00
Roshan Pius
aabe575536 wifi: Restructure wifi legacy HAL implementation
Restructured the existing code to create a new class called
|WifiLegacyHal|. This class will be used as a wrapper to invoke
all the legacy HAL functions and handle the "C" style callbacks.

Bug: 31936700
Test: mmma -j32 hardware/interfaces/wifi/1.0/default
Change-Id: I63e8543f49886f8446101320a97d1e96e30d1035
2016-10-04 18:36:22 -07:00
Yifan Hong
a30e27f697 Add test for referring to nested types.
am: 61db854465

Change-Id: Ie4a21561afd882184fe0d9aa1c2772b5849222f7
2016-10-04 21:10:15 +00:00
Roshan Pius
79a9975d07 wifi: Change namespace
Move the implementation to "android::hardware::wifi:V1_0::implementation"
namespace.
This is following the style guidelines in NFC HIDL
implementation(go/aog/279421).

While there,
Run checkstyle to correct formatting issues.

Bug:31936700
Test: mmma -j32 hardware/interfaces/wifi/1.0/default
Change-Id: I5600a60a0041b3318ed9289823ec335a8ed8a83d
2016-10-04 13:23:20 -07:00
Roshan Pius
3c4e8a358c wifi: Move legacy HAL implementation
Changes in the CL:
1. Move the legacy HAL implementation from
"frameworks/opt/net/wifi/wifi_hal_legacy" to
"hardware/interfaces/wifi/1.0/default".
2. Renamed the .rc file and the module name in makefile to
conform to the HIDL style guide.

Files renamed from:
wifi_hal_service.cpp/h -> wifi.cpp/h
wifi_chip_service.cpp/h -> wifi_chip.cpp/h
main.cpp -> service

Bug: 31821133
Test: mmma -j32 hardware/interfaces/wifi/1.0/default
Change-Id: I5e65e2fdb5596346bde6963588031dcea42d633a
2016-10-04 13:10:25 -07:00
Yifan Hong
61db854465 Add test for referring to nested types.
Bug: 31821285

Test: `make hidl_test && adb sync && adb shell hidl_test`
Change-Id: Iae030baa5bbe6e890512b494a0b657163c6a99a6
2016-10-04 10:40:55 -07:00