* [PATCH v3 2/7] cdma-sms: Add CDMA SMS Support
@ 2011-01-04 23:00 Lei Yu
2011-01-04 23:06 ` Denis Kenzior
2011-01-05 19:17 ` Rajesh.Nagaiah
0 siblings, 2 replies; 6+ messages in thread
From: Lei Yu @ 2011-01-04 23:00 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 3102 bytes --]
---
Makefile.am | 3 +-
include/cdma-sms.h | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 69 insertions(+), 1 deletions(-)
create mode 100644 include/cdma-sms.h
diff --git a/Makefile.am b/Makefile.am
index 8a8555d..5028f4f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,8 @@ include_HEADERS = include/log.h include/plugin.h include/history.h \
include/gprs.h include/gprs-context.h \
include/radio-settings.h include/stk.h \
include/audio-settings.h include/nettime.h \
- include/ctm.h include/cdma-voicecall.h
+ include/ctm.h include/cdma-voicecall.h \
+ include/cdma-sms.h
nodist_include_HEADERS = include/version.h
diff --git a/include/cdma-sms.h b/include/cdma-sms.h
new file mode 100644
index 0000000..90d8803
--- /dev/null
+++ b/include/cdma-sms.h
@@ -0,0 +1,67 @@
+/*
+ *
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2010-2011 Nokia Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifndef __OFONO_CDMA_SMS_H
+#define __OFONO_CDMA_SMS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <ofono/types.h>
+
+struct ofono_cdma_sms;
+
+typedef void (*ofono_cdma_sms_submit_cb_t)(const struct ofono_error *error,
+ void *data);
+
+struct ofono_cdma_sms_driver {
+ const char *name;
+ int (*probe)(struct ofono_cdma_sms *cdma_sms, unsigned int vendor,
+ void *data);
+ void (*remove)(struct ofono_cdma_sms *cdma_sms);
+ void (*submit)(struct ofono_cdma_sms *cdma_sms, unsigned char *tpdu,
+ int tpdu_len, ofono_cdma_sms_submit_cb_t cb,
+ void *data);
+};
+
+void ofono_cdma_sms_deliver_notify(struct ofono_cdma_sms *cdma_sms,
+ unsigned char *pdu, int tpdu_len);
+
+int ofono_cdma_sms_driver_register(const struct ofono_cdma_sms_driver *d);
+void ofono_cdma_sms_driver_unregister(const struct ofono_cdma_sms_driver *d);
+
+struct ofono_cdma_sms *ofono_cdma_sms_create(struct ofono_modem *modem,
+ unsigned int vendor,
+ const char *driver,
+ void *data);
+
+void ofono_cdma_sms_register(struct ofono_cdma_sms *cdma_sms);
+void ofono_cdma_sms_remove(struct ofono_cdma_sms *cdma_sms);
+
+void ofono_cdma_sms_set_data(struct ofono_cdma_sms *cdma_sms, void *data);
+void *ofono_cdma_sms_get_data(struct ofono_cdma_sms *cdma_sms);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __OFONO_CDMA_SMS_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/7] cdma-sms: Add CDMA SMS Support
2011-01-04 23:00 [PATCH v3 2/7] cdma-sms: Add CDMA SMS Support Lei Yu
@ 2011-01-04 23:06 ` Denis Kenzior
2011-01-05 16:22 ` Lei Yu
2011-01-05 19:17 ` Rajesh.Nagaiah
1 sibling, 1 reply; 6+ messages in thread
From: Denis Kenzior @ 2011-01-04 23:06 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 991 bytes --]
Hi Lei,
On 01/04/2011 05:00 PM, Lei Yu wrote:
> ---
> Makefile.am | 3 +-
> include/cdma-sms.h | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 69 insertions(+), 1 deletions(-)
> create mode 100644 include/cdma-sms.h
>
Still doesn't apply:
denkenz(a)ubuntu:~/ofono-master$ git am --3way ~/merge/\[PATCH\ v2\,\
2_7\]\ cdma-sms\:\ Add\ CDMA\ SMS\ Support.eml
Applying: cdma-sms: Add CDMA SMS Support
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging Makefile.am
CONFLICT (content): Merge conflict in Makefile.am
Failed to merge in the changes.
Patch failed at 0001 cdma-sms: Add CDMA SMS Support
When you have resolved this problem run "git am -3 --resolved".
If you would prefer to skip this patch, instead run "git am -3 --skip".
To restore the original branch and stop patching run "git am -3 --abort".
Have you rebased to the latest git?
Regards,
-Denis
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/7] cdma-sms: Add CDMA SMS Support
2011-01-04 23:06 ` Denis Kenzior
@ 2011-01-05 16:22 ` Lei Yu
2011-01-05 16:38 ` Denis Kenzior
0 siblings, 1 reply; 6+ messages in thread
From: Lei Yu @ 2011-01-05 16:22 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 1335 bytes --]
Hi Denis,
On 01/04/2011 03:06 PM, ext Denis Kenzior wrote:
> Hi Lei,
>
> On 01/04/2011 05:00 PM, Lei Yu wrote:
>> ---
>> Makefile.am | 3 +-
>> include/cdma-sms.h | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>> 2 files changed, 69 insertions(+), 1 deletions(-)
>> create mode 100644 include/cdma-sms.h
>>
>
> Still doesn't apply:
> denkenz(a)ubuntu:~/ofono-master$ git am --3way ~/merge/\[PATCH\ v2\,\
> 2_7\]\ cdma-sms\:\ Add\ CDMA\ SMS\ Support.eml
> Applying: cdma-sms: Add CDMA SMS Support
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> Auto-merging Makefile.am
> CONFLICT (content): Merge conflict in Makefile.am
> Failed to merge in the changes.
> Patch failed at 0001 cdma-sms: Add CDMA SMS Support
> When you have resolved this problem run "git am -3 --resolved".
> If you would prefer to skip this patch, instead run "git am -3 --skip".
> To restore the original branch and stop patching run "git am -3 --abort".
>
> Have you rebased to the latest git?
>
> Regards,
> -Denis
Looks like you are still applying v2 of the patch instead of v3 of the
patch. v3 is the one I did the rebase and I have applied the patch
locally and did not see any problem. Could you pls apply v3 instead?
Regards,
-Lei
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/7] cdma-sms: Add CDMA SMS Support
2011-01-05 16:22 ` Lei Yu
@ 2011-01-05 16:38 ` Denis Kenzior
0 siblings, 0 replies; 6+ messages in thread
From: Denis Kenzior @ 2011-01-05 16:38 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 307 bytes --]
Hi Lei,
> Looks like you are still applying v2 of the patch instead of v3 of the
> patch. v3 is the one I did the rebase and I have applied the patch
> locally and did not see any problem. Could you pls apply v3 instead?
>
Yep, my fault. Patch has now been applied. Thanks.
Regards,
-Denis
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH v3 2/7] cdma-sms: Add CDMA SMS Support
2011-01-04 23:00 [PATCH v3 2/7] cdma-sms: Add CDMA SMS Support Lei Yu
2011-01-04 23:06 ` Denis Kenzior
@ 2011-01-05 19:17 ` Rajesh.Nagaiah
2011-01-06 16:58 ` Lei Yu
1 sibling, 1 reply; 6+ messages in thread
From: Rajesh.Nagaiah @ 2011-01-05 19:17 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
Hi Lei,
> +void ofono_cdma_sms_deliver_notify(struct ofono_cdma_sms *cdma_sms,
> + unsigned char *pdu, int
tpdu_len);
As there is no SC number in CDMA, the whole PDU is the actual TPDU as
well.
So either we should call pdu/pdu_len or tpdu/tpdu_len. Having
pdu/tpdu_len
might be mistaken.
BR,
Rajesh
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/7] cdma-sms: Add CDMA SMS Support
2011-01-05 19:17 ` Rajesh.Nagaiah
@ 2011-01-06 16:58 ` Lei Yu
0 siblings, 0 replies; 6+ messages in thread
From: Lei Yu @ 2011-01-06 16:58 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 652 bytes --]
Hi Rajesh,
On 01/05/2011 11:17 AM, ext Rajesh.Nagaiah(a)elektrobit.com wrote:
> Hi Lei,
>
>> +void ofono_cdma_sms_deliver_notify(struct ofono_cdma_sms *cdma_sms,
>> + unsigned char *pdu, int
> tpdu_len);
>
> As there is no SC number in CDMA, the whole PDU is the actual TPDU as
> well.
> So either we should call pdu/pdu_len or tpdu/tpdu_len. Having
> pdu/tpdu_len
> might be mistaken.
>
Will change to tpdu/tpdu_len per CDMA SMS spec for transport layer.
> BR,
> Rajesh
> _______________________________________________
> ofono mailing list
> ofono(a)ofono.org
> http://lists.ofono.org/listinfo/ofono
Regards,
Lei
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-01-06 16:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-04 23:00 [PATCH v3 2/7] cdma-sms: Add CDMA SMS Support Lei Yu
2011-01-04 23:06 ` Denis Kenzior
2011-01-05 16:22 ` Lei Yu
2011-01-05 16:38 ` Denis Kenzior
2011-01-05 19:17 ` Rajesh.Nagaiah
2011-01-06 16:58 ` Lei Yu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.