Commit 58082073 authored by spiiroin's avatar spiiroin

Merge branch 'jb43928_mode_details_on_dbus' into 'master'

Expose dynamic mode configuration on D-Bus

See merge request !46
parents 7061235e 57f8c996
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
send_interface="com.meego.usb_moded" send_member="get_net_config"/> send_interface="com.meego.usb_moded" send_member="get_net_config"/>
<allow send_destination="com.meego.usb_moded" <allow send_destination="com.meego.usb_moded"
send_interface="com.meego.usb_moded" send_member="rescue_off"/> send_interface="com.meego.usb_moded" send_member="rescue_off"/>
<allow send_destination="com.meego.usb_moded"
send_interface="com.meego.usb_moded" send_member="get_target_mode_config"/>
<deny send_destination="com.meego.usb_moded" <deny send_destination="com.meego.usb_moded"
send_interface="com.meego.usb_moded" send_member="set_whitelist"/> send_interface="com.meego.usb_moded" send_member="set_whitelist"/>
<deny send_destination="com.meego.usb_moded" <deny send_destination="com.meego.usb_moded"
......
...@@ -90,5 +90,11 @@ ...@@ -90,5 +90,11 @@
<signal name="sig_usb_whitelisted_modes_ind"> <signal name="sig_usb_whitelisted_modes_ind">
<arg name="modes" type="s"/> <arg name="modes" type="s"/>
</signal> </signal>
<signal name="sig_usb_taget_mode_config_ind">
<arg name="config" type="a{sv}"/>
</signal>
<method name="get_target_mode_config">
<arg name="config" type="a{sv}" direction="out"/>
</signal>
</interface> </interface>
</node> </node>
This diff is collapsed.
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
# define USB_MODE_HIDDEN_MODES_SIGNAL_NAME "sig_usb_hidden_modes_ind" # define USB_MODE_HIDDEN_MODES_SIGNAL_NAME "sig_usb_hidden_modes_ind"
# define USB_MODE_WHITELISTED_MODES_SIGNAL_NAME "sig_usb_whitelisted_modes_ind" # define USB_MODE_WHITELISTED_MODES_SIGNAL_NAME "sig_usb_whitelisted_modes_ind"
# define USB_MODE_AVAILABLE_MODES_SIGNAL_NAME "sig_usb_available_modes_ind" # define USB_MODE_AVAILABLE_MODES_SIGNAL_NAME "sig_usb_available_modes_ind"
# define USB_MODE_TARGET_CONFIG_SIGNAL_NAME "sig_usb_taget_mode_config_ind"
/* supported methods */ /* supported methods */
# define USB_MODE_STATE_REQUEST "mode_request" /* returns the current mode */ # define USB_MODE_STATE_REQUEST "mode_request" /* returns the current mode */
...@@ -74,6 +75,7 @@ ...@@ -74,6 +75,7 @@
# define USB_MODE_WHITELISTED_MODES_SET "set_whitelisted_modes" /* set the list of whitelisted modes */ # define USB_MODE_WHITELISTED_MODES_SET "set_whitelisted_modes" /* set the list of whitelisted modes */
# define USB_MODE_WHITELISTED_SET "set_whitelisted" /* sets whether an specific mode is in the whitelist */ # define USB_MODE_WHITELISTED_SET "set_whitelisted" /* sets whether an specific mode is in the whitelist */
# define USB_MODE_AVAILABLE_MODES_GET "get_available_modes" /* returns a comma separated list of modes which are currently available for selection */ # define USB_MODE_AVAILABLE_MODES_GET "get_available_modes" /* returns a comma separated list of modes which are currently available for selection */
# define USB_MODE_TARGET_CONFIG_GET "get_target_mode_config" /* returns current target mode configuration */
/** /**
* (Transient) states reported by "sig_usb_state_ind" that are not modes. * (Transient) states reported by "sig_usb_state_ind" that are not modes.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment