[Asterisk-Users] chan-sccp-easter2005 make error with stable 1.0.6?

[Andrew A. Kochetkoff]

Hi Julien!
Julien Goodwin wrote:
> On Mon, Mar 21, 2005 at 01:03:52PM -0700, Kevin P. Fleming arranged a set of bits into the following:
> 
>>Remco Barende wrote:
>>
>>
>>>Are you sure? This is in the makefile:
>>>
>>># Asterisk version, currently only v1_0 and HEAD are supported
>>>ASTERISK_VERSION=v1_0
>>
>>Well, then the code is buggy, because the channel technology structure 
>>stuff is only in HEAD, not 1.0.
> 
> And indeed it was, is wasn't checking the asterisk version at one place,
> that's now fixed.
> 
> See if you actually let me know about these things they get fixed!
> 
> Thanks,
> Julien
> chan_sccp deveoper
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> Asterisk-Users mailing list
> Asterisk-Users at lists.digium.com
> http://lists.digium.com/mailman/listinfo/asterisk-users
> To UNSUBSCRIBE or update options visit:
>    http://lists.digium.com/mailman/listinfo/asterisk-users

I'm modify two files in chan-sccp-easter2005.
It's chan_sccp.h and sccp_pbx.h and i can compile chan_sccp with 
Asterisk Stable 1.0.6

####### chan_sccp.h with my include for CISCO CP-7902G (Do not work 
normally)

--- /dist/chan_sccp/chan_sccp.h Sun Mar 20 14:06:57 2005
+++ chan_sccp.h Tue Mar 22 18:20:08 2005
@@ -1257,6 +1257,7 @@
    {122, "RASProxy"},
    {255, "NotDefined"},
    {30006, "Cisco7970"},
+  {30008, "Cisco7902"},
    { 0    , NULL}
  };

@@ -1606,6 +1607,21 @@
    // Anybody know what the display button does?
  };

+static const btnlist layout_7902 [] = {
+  {BtLine},
+  {BtHold},
+  {BtTransfer},
+  {BtDisplay},
+  {BtVoiceMail},
+  {BtConference},
+  {BtForwardAll},
+  {BtSpeedDial},
+  {BtSpeedDial},
+  {BtSpeedDial},
+  {BtSpeedDial},
+  {BtLastNumberRedial},
+};
+
  static const btnlist layout_7910 [] = {
    {BtLine},
    {BtHold},
@@ -1687,6 +1703,7 @@
  static const button_modes default_layouts [] = {
    { "12",   12, layout_12SPPLUS }, // Two colums of six buttons
    { "30",   26, layout_30VIP }, // Two colums of 13 buttons (26), plus 
4 fixed feature
+  { "7902", 12, layout_7902 },
    { "7910", 10, layout_7910 },
    { "7914", 20, layout_7960_7914 },
    { "7920", 6,  layout_7920 },
@@ -1719,8 +1736,12 @@
  extern char             date_format[6];
  extern struct sched_context * sccp_sched;

-
+#ifdef ASTERISK_VERSION_v1_0
+struct ast_channel *sccp_request(char *type, int format, void *data);
+#endif
+#ifdef ASTERISK_VERSION_HEAD
  struct ast_channel *sccp_request(char *type, int format, void *data, 
int *cause);
+#endif
  int sccp_devicestate(void *data);

  #endif /* __CHAN_SCCP_H */

############# sccp_pbx.h
--- /dist/chan_sccp/sccp_pbx.h  Sun Mar 20 14:06:57 2005
+++ sccp_pbx.h  Tue Mar 22 18:09:00 2005
@@ -2,4 +2,6 @@
  void * sccp_start_channel (void *data);
  void start_rtp(sccp_channel_t * sub);

+#ifdef ASTERISK_VERSION_HEAD
  const struct ast_channel_tech sccp_tech;
+#endif

Regards,
Andrew Kochetkoff