Skip to content

Commit

Permalink
caif: Rename functions in cfcnfg and caif_dev
Browse files Browse the repository at this point in the history 
Changes:
 o Renamed cfcnfg_del_adapt_layer to cfcnfg_disconn_adapt_layer
 o Fixed typo cfcfg to cfcnfg
 o Renamed linkid to channel_id
 o Updated documentation in caif_dev.h
 o Minor formatting changes

Signed-off-by: Sjur Braendeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Sjur Braendeland authored and David S. Miller committed Apr 28, 2010
1 parent d3f744e commit e539d83
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 41 deletions.
6 changes: 4 additions & 2 deletions include/net/caif/caif_dev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,19 @@ struct caif_param {
};

/**
* caif_connect_request - Request data for CAIF channel setup.
* struct caif_connect_request - Request data for CAIF channel setup.
* @protocol: Type of CAIF protocol to use (at, datagram etc)
* @sockaddr: Socket address to connect.
* @priority: Priority of the connection.
* @link_selector: Link selector (high bandwidth or low latency)
* @link_name: Name of the CAIF Link Layer to use.
* @param: Connect Request parameters (CAIF_SO_REQ_PARAM).
*
* This struct is used when connecting a CAIF channel.
* It contains all CAIF channel configuration options.
*/
struct caif_connect_request {
int protocol;
enum caif_protocol_type protocol;
struct sockaddr_caif sockaddr;
enum caif_channel_priority priority;
enum caif_link_selector link_selector;
Expand Down
10 changes: 5 additions & 5 deletions include/net/caif/cfcnfg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,14 @@ cfcnfg_add_phy_layer(struct cfcnfg *cnfg, enum cfcnfg_phy_type phy_type,
int cfcnfg_del_phy_layer(struct cfcnfg *cnfg, struct cflayer *phy_layer);

/**
* cfcnfg_del_adapt_layer - Deletes an adaptation layer from the CAIF stack.
* cfcnfg_disconn_adapt_layer - Disconnects an adaptation layer.
*
* @cnfg: Pointer to a CAIF configuration object, created by
* cfcnfg_create().
* @adap_layer: Adaptation layer to be removed.
*/
int cfcnfg_del_adapt_layer(struct cfcnfg *cnfg, struct cflayer *adap_layer);
int cfcnfg_disconn_adapt_layer(struct cfcnfg *cnfg,
struct cflayer *adap_layer);

/**
* cfcnfg_add_adaptation_layer - Add an adaptation layer to the CAIF stack.
Expand All @@ -102,14 +103,13 @@ int cfcnfg_del_adapt_layer(struct cfcnfg *cnfg, struct cflayer *adap_layer);
* driver functionality is implemented.
*
* @cnfg: Pointer to a CAIF configuration object, created by
* cfcnfg_create().
* cfcnfg_create().
* @param: Link setup parameters.
* @adap_layer: Specify the adaptation layer; the receive and
* flow-control functions MUST be set in the structure.
*
*/
int
cfcnfg_add_adaptation_layer(struct cfcnfg *cnfg,
int cfcnfg_add_adaptation_layer(struct cfcnfg *cnfg,
struct cfctrl_link_param *param,
struct cflayer *adap_layer);

Expand Down
15 changes: 7 additions & 8 deletions net/caif/caif_dev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,20 +330,19 @@ int caif_connect_client(struct caif_connect_request *conn_req,
struct cflayer *client_layer)
{
struct cfctrl_link_param param;
if (connect_req_to_link_param(get_caif_conf(), conn_req, &param) == 0)
/* Hook up the adaptation layer. */
return cfcnfg_add_adaptation_layer(get_caif_conf(),
int ret;
ret = connect_req_to_link_param(get_caif_conf(), conn_req, &param);
if (ret)
return ret;
/* Hook up the adaptation layer. */
return cfcnfg_add_adaptation_layer(get_caif_conf(),
&param, client_layer);

return -EINVAL;

caif_assert(0);
}
EXPORT_SYMBOL(caif_connect_client);

int caif_disconnect_client(struct cflayer *adap_layer)
{
return cfcnfg_del_adapt_layer(get_caif_conf(), adap_layer);
return cfcnfg_disconn_adapt_layer(get_caif_conf(), adap_layer);
}
EXPORT_SYMBOL(caif_disconnect_client);

Expand Down
51 changes: 25 additions & 26 deletions net/caif/cfcnfg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ struct cfcnfg {
struct cfcnfg_phyinfo phy_layers[MAX_PHY_LAYERS];
};

static void cncfg_linkup_rsp(struct cflayer *layer, u8 linkid,
static void cfcnfg_linkup_rsp(struct cflayer *layer, u8 channel_id,
enum cfctrl_srv serv, u8 phyid,
struct cflayer *adapt_layer);
static void cncfg_linkdestroy_rsp(struct cflayer *layer, u8 linkid,
static void cfcnfg_linkdestroy_rsp(struct cflayer *layer, u8 channel_id,
struct cflayer *client_layer);
static void cncfg_reject_rsp(struct cflayer *layer, u8 linkid,
static void cfcnfg_reject_rsp(struct cflayer *layer, u8 channel_id,
struct cflayer *adapt_layer);
static void cfctrl_resp_func(void);
static void cfctrl_enum_resp(void);
Expand All @@ -82,13 +82,13 @@ struct cfcnfg *cfcnfg_create(void)
resp = cfctrl_get_respfuncs(this->ctrl);
resp->enum_rsp = cfctrl_enum_resp;
resp->linkerror_ind = cfctrl_resp_func;
resp->linkdestroy_rsp = cncfg_linkdestroy_rsp;
resp->linkdestroy_rsp = cfcnfg_linkdestroy_rsp;
resp->sleep_rsp = cfctrl_resp_func;
resp->wake_rsp = cfctrl_resp_func;
resp->restart_rsp = cfctrl_resp_func;
resp->radioset_rsp = cfctrl_resp_func;
resp->linksetup_rsp = cncfg_linkup_rsp;
resp->reject_rsp = cncfg_reject_rsp;
resp->linksetup_rsp = cfcnfg_linkup_rsp;
resp->reject_rsp = cfcnfg_reject_rsp;

this->last_phyid = 1;

Expand Down Expand Up @@ -191,8 +191,7 @@ int cfcnfg_get_named(struct cfcnfg *cnfg, char *name)
* 4) Link-Error - (no response)
* Not handled, but this should be a CAIF PROTOCOL ERROR
*/

int cfcnfg_del_adapt_layer(struct cfcnfg *cnfg, struct cflayer *adap_layer)
int cfcnfg_disconn_adapt_layer(struct cfcnfg *cnfg, struct cflayer *adap_layer)
{
u8 channel_id = 0;
int ret = 0;
Expand Down Expand Up @@ -246,9 +245,9 @@ int cfcnfg_del_adapt_layer(struct cfcnfg *cnfg, struct cflayer *adap_layer)
return ret;

}
EXPORT_SYMBOL(cfcnfg_del_adapt_layer);
EXPORT_SYMBOL(cfcnfg_disconn_adapt_layer);

static void cncfg_linkdestroy_rsp(struct cflayer *layer, u8 linkid,
static void cfcnfg_linkdestroy_rsp(struct cflayer *layer, u8 channel_id,
struct cflayer *client_layer)
{
struct cfcnfg *cnfg = container_obj(layer);
Expand All @@ -258,20 +257,20 @@ static void cncfg_linkdestroy_rsp(struct cflayer *layer, u8 linkid,
* 1) Remove service from the MUX layer. The MUX must
* guarante that no more payload sent "upwards" (receive)
*/
servl = cfmuxl_remove_uplayer(cnfg->mux, linkid);
servl = cfmuxl_remove_uplayer(cnfg->mux, channel_id);

if (servl == NULL) {
pr_err("CAIF: %s(): PROTOCOL ERROR "
"- Error removing service_layer Linkid(%d)",
__func__, linkid);
"- Error removing service_layer Channel_Id(%d)",
__func__, channel_id);
return;
}
caif_assert(linkid == servl->id);
caif_assert(channel_id == servl->id);

if (servl != client_layer && servl->up != client_layer) {
pr_err("CAIF: %s(): Error removing service_layer "
"Linkid(%d) %p %p",
__func__, linkid, (void *) servl,
"Channel_Id(%d) %p %p",
__func__, channel_id, (void *) servl,
(void *) client_layer);
return;
}
Expand Down Expand Up @@ -345,7 +344,7 @@ cfcnfg_add_adaptation_layer(struct cfcnfg *cnfg,
}
EXPORT_SYMBOL(cfcnfg_add_adaptation_layer);

static void cncfg_reject_rsp(struct cflayer *layer, u8 linkid,
static void cfcnfg_reject_rsp(struct cflayer *layer, u8 channel_id,
struct cflayer *adapt_layer)
{
if (adapt_layer != NULL && adapt_layer->ctrlcmd != NULL)
Expand All @@ -354,7 +353,7 @@ static void cncfg_reject_rsp(struct cflayer *layer, u8 linkid,
}

static void
cncfg_linkup_rsp(struct cflayer *layer, u8 linkid, enum cfctrl_srv serv,
cfcnfg_linkup_rsp(struct cflayer *layer, u8 channel_id, enum cfctrl_srv serv,
u8 phyid, struct cflayer *adapt_layer)
{
struct cfcnfg *cnfg = container_obj(layer);
Expand Down Expand Up @@ -383,26 +382,26 @@ cncfg_linkup_rsp(struct cflayer *layer, u8 linkid, enum cfctrl_srv serv,
_CAIF_MODEMCMD_PHYIF_USEFULL);

}
adapt_layer->id = linkid;
adapt_layer->id = channel_id;

switch (serv) {
case CFCTRL_SRV_VEI:
servicel = cfvei_create(linkid, &phyinfo->dev_info);
servicel = cfvei_create(channel_id, &phyinfo->dev_info);
break;
case CFCTRL_SRV_DATAGRAM:
servicel = cfdgml_create(linkid, &phyinfo->dev_info);
servicel = cfdgml_create(channel_id, &phyinfo->dev_info);
break;
case CFCTRL_SRV_RFM:
servicel = cfrfml_create(linkid, &phyinfo->dev_info);
servicel = cfrfml_create(channel_id, &phyinfo->dev_info);
break;
case CFCTRL_SRV_UTIL:
servicel = cfutill_create(linkid, &phyinfo->dev_info);
servicel = cfutill_create(channel_id, &phyinfo->dev_info);
break;
case CFCTRL_SRV_VIDEO:
servicel = cfvidl_create(linkid, &phyinfo->dev_info);
servicel = cfvidl_create(channel_id, &phyinfo->dev_info);
break;
case CFCTRL_SRV_DBG:
servicel = cfdbgl_create(linkid, &phyinfo->dev_info);
servicel = cfdbgl_create(channel_id, &phyinfo->dev_info);
break;
default:
pr_err("CAIF: %s(): Protocol error. "
Expand All @@ -415,7 +414,7 @@ cncfg_linkup_rsp(struct cflayer *layer, u8 linkid, enum cfctrl_srv serv,
return;
}
layer_set_dn(servicel, cnfg->mux);
cfmuxl_set_uplayer(cnfg->mux, servicel, linkid);
cfmuxl_set_uplayer(cnfg->mux, servicel, channel_id);
layer_set_up(servicel, adapt_layer);
layer_set_dn(adapt_layer, servicel);
servicel->ctrlcmd(servicel, CAIF_CTRLCMD_INIT_RSP, 0);
Expand Down

0 comments on commit e539d83

Please sign in to comment.