--- a/src/cs/drivers/drv_app/fchg/fchg_api.c	Fri Dec 15 19:58:18 2017 +0000
+++ b/src/cs/drivers/drv_app/fchg/fchg_api.c	Fri Dec 15 21:05:00 2017 +0000
@@ -11,9 +11,50 @@
 
 T_RV_RET fchg_get_current_state(struct fchg_user_state *rstruct)
 {
+	if (!pwr_ctrl)
+		return RV_NOT_READY;
 	rstruct->chg_state = pwr_ctrl->state;
 	rstruct->batt_mv = pwr_ctrl->batt_mv;
 	rstruct->batt_percent =
 	    pwr_ctrl->batt_thresholds[pwr_ctrl->curr_disch_thresh].remain_capa;
 	return RV_OK;
 }
+
+T_RV_RET fchg_user_charge_control(enum fchg_user_charge_ctrl arg)
+{
+	enum pwr_msg_id msg_id;
+	struct pwr_req_s *msg;
+
+	if (!pwr_ctrl)
+		return RV_NOT_READY;
+	switch (arg) {
+	case FCHG_CHARGE_START:
+		if (!pwr_ctrl->config_present)
+			return RV_NOT_READY;
+		msg_id = USER_START_CHARGE_REQ;
+		break;
+	case FCHG_CHARGE_STOP:
+		msg_id = USER_STOP_CHARGE_REQ;
+		break;
+	default:
+		return RV_INVALID_PARAMETER;
+	}
+	if (rvf_get_buf(pwr_ctrl->prim_id, sizeof(struct pwr_req_s),
+			(T_RVF_BUFFER **)&msg) == RVF_RED) {
+		rvf_send_trace(
+			"rvf_get_buf() failed in fchg_user_charge_control()",
+			50, NULL_PARAM, RV_TRACE_LEVEL_ERROR, FCHG_USE_ID);
+		return RV_MEMORY_ERR;
+	}
+	msg->header.msg_id        = msg_id;
+	msg->header.src_addr_id   = pwr_ctrl->addr_id;
+	msg->header.dest_addr_id  = pwr_ctrl->addr_id;
+	msg->header.callback_func = NULL;
+	if (rvf_send_msg(pwr_ctrl->addr_id, msg) != RV_OK) {
+		rvf_send_trace("fchg_user_charge_control(): Send failed!", 40,
+				NULL_PARAM, RV_TRACE_LEVEL_ERROR, FCHG_USE_ID);
+		rvf_free_buf(msg);
+		return RV_INTERNAL_ERR;
+	}
+	return RV_OK;
+}