recipes/pandora-system/pandora-wifi/0003-Oooops-now-lets-try-something-that-compiles.patch

   1 From 1f1f727cb943b9abd8e279c6b9b45ae29b6a14f6 Mon Sep 17 00:00:00 2001
   2 From: David-John Willis <John.Willis@Distant-earth.com>
   3 Date: Thu, 11 Jun 2009 10:00:13 +0100
   4 Subject: [PATCH 3/5] Oooops, now lets try something that compiles ;-)
   5
   6 ---
   7  sta_dk_4_0_4_32/pform/linux/src/iw_ioctl.c |   73 ++++++++++++++--------------
   8  1 files changed, 36 insertions(+), 37 deletions(-)
   9
  10 diff --git a/sta_dk_4_0_4_32/pform/linux/src/iw_ioctl.c b/sta_dk_4_0_4_32/pform/linux/src/iw_ioctl.c
  11 index 28011e8..f925b21 100755
  12 --- a/sta_dk_4_0_4_32/pform/linux/src/iw_ioctl.c
  13 +++ b/sta_dk_4_0_4_32/pform/linux/src/iw_ioctl.c
  14 @@ -124,7 +124,7 @@ static int iw_get_name(struct net_device *dev,
  15  {
  16         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
  17         int i;
  18 -#if IOCTL_DBG
  19 +#ifdef IOCTL_DBG
  20         printk("%s Call\n", __FUNCTION__);
  21  #endif
  22  /*
  23 @@ -164,7 +164,7 @@ static int iw_ioctl_siwencode(struct net_device *dev,
  24         int i;
  25         ULONG len;
  26
  27 -#if IOCTL_DBG
  28 +#ifdef IOCTL_DBG
  29         printk("%s Call\n", __FUNCTION__);
  30  #endif
  31         i = erq->flags & IW_ENCODE_INDEX;
  32 @@ -254,7 +254,7 @@ static int iw_ioctl_giwencode(struct net_device *dev,
  33         ULONG                   len, i;
  34         UINT8                   MixedMode;
  35
  36 -#if IOCTL_DBG
  37 +#ifdef IOCTL_DBG
  38         printk("%s Call\n", __FUNCTION__);
  39  #endif
  40         i = erq->flags & IW_ENCODE_INDEX;
  41 @@ -273,7 +273,7 @@ static int iw_ioctl_giwencode(struct net_device *dev,
  42         UtilWepStatusGet(pAdapter, (UINT8 *)&cipher, &len);
  43         erq->flags = i + 1;
  44
  45 -#if IOCTL_DBG
  46 +#ifdef IOCTL_DBG
  47         printk("%s Call cipher=%d\n", __FUNCTION__, cipher);
  48  #endif
  49
  50 @@ -333,7 +333,7 @@ static int iw_ioctl_siwrate(struct net_device *dev,
  51         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
  52         u32 val;
  53
  54 -#if IOCTL_DBG
  55 +#ifdef IOCTL_DBG
  56         printk("%s Call\n", __FUNCTION__);
  57  #endif
  58         if (!rrq->fixed)
  59 @@ -352,7 +352,7 @@ static int iw_ioctl_giwrate(struct net_device *dev,
  60         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
  61         ULONG val=0, len;
  62
  63 -#if IOCTL_DBG
  64 +#ifdef IOCTL_DBG
  65         printk("%s Call\n", __FUNCTION__);
  66  #endif
  67         if (UtilCurrentRatesGet(pAdapter, (UINT8 *)&val, &len))
  68 @@ -389,7 +389,7 @@ static int iw_ioctl_giwaplist(struct net_device *dev,
  69         OS_802_11_BSSID_LIST_EX *list;
  70         int i;
  71
  72 -#if IOCTL_DBG
  73 +#ifdef IOCTL_DBG
  74         printk("%s Call\n", __FUNCTION__);
  75  #endif
  76         printk("iw_ioctl_giwaplist\n");
  77 @@ -433,7 +433,7 @@ static int iw_ioctl_siwrts(struct net_device *dev,
  78         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
  79         u32 val;
  80
  81 -#if IOCTL_DBG
  82 +#ifdef IOCTL_DBG
  83         printk("%s Call\n", __FUNCTION__);
  84  #endif
  85         if (rts->disabled)
  86 @@ -455,7 +455,7 @@ static int iw_ioctl_giwrts(struct net_device *dev,
  87         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
  88         ULONG val, len;
  89
  90 -#if IOCTL_DBG
  91 +#ifdef IOCTL_DBG
  92         printk("%s Call\n", __FUNCTION__);
  93  #endif
  94         if (UtilRtsThresholdGet(pAdapter, (UINT8 *)&val, &len))
  95 @@ -476,7 +476,7 @@ static int iw_ioctl_siwfrag(struct net_device *dev,
  96         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
  97         u32 val;
  98
  99 -#if IOCTL_DBG
 100 +#ifdef IOCTL_DBG
 101         printk("%s Call\n", __FUNCTION__);
 102  #endif
 103         if (rts->disabled)
 104 @@ -499,7 +499,7 @@ static int iw_ioctl_giwfrag(struct net_device *dev,
 105         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 106         ULONG val, len;
 107
 108 -#if IOCTL_DBG
 109 +#ifdef IOCTL_DBG
 110         printk("%s Call\n", __FUNCTION__);
 111  #endif
 112         if (UtilFragmentationThresholdGet(pAdapter, (UINT8 *)&val, &len))
 113 @@ -520,7 +520,7 @@ static int iw_ioctl_siwap(struct net_device *dev,
 114  {
 115         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 116
 117 -#if IOCTL_DBG
 118 +#ifdef IOCTL_DBG
 119         printk("%s Call\n", __FUNCTION__);
 120  #endif
 121         return UtilSetBSSID(pAdapter, (UINT8 *)&ap_addr->sa_data, ETH_ALEN);
 122 @@ -533,7 +533,7 @@ static int iw_ioctl_giwap(struct net_device *dev,
 123         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 124         ULONG len;
 125
 126 -#if IOCTL_DBG
 127 +#ifdef IOCTL_DBG
 128         printk("%s Call\n", __FUNCTION__);
 129  #endif
 130         ap_addr->sa_family = ARPHRD_ETHER;
 131 @@ -544,7 +544,7 @@ static int iw_ioctl_giwnickn(struct net_device *dev,
 132                                  struct iw_request_info *info,
 133                                  struct iw_point *data, char *nickname)
 134  {
 135 -#if IOCTL_DBG
 136 +#ifdef IOCTL_DBG
 137         printk("%s Call\n", __FUNCTION__);
 138  #endif
 139         data->length = 7;
 140 @@ -560,7 +560,7 @@ static int iw_ioctl_siwfreq(struct net_device *dev,
 141  {
 142         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 143
 144 -#if IOCTL_DBG
 145 +#ifdef IOCTL_DBG
 146         printk("%s Call\n", __FUNCTION__);
 147  #endif
 148         if (freq->m == -1)
 149 @@ -594,7 +594,7 @@ static int iw_ioctl_giwfreq(struct net_device *dev, struct iw_request_info *info
 150         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 151         ULONG val, len;
 152
 153 -#if IOCTL_DBG
 154 +#ifdef IOCTL_DBG
 155         printk("%s Call\n", __FUNCTION__);
 156  #endif
 157         if (!pAdapter->CoreHalCtx) {
 158 @@ -620,7 +620,7 @@ static int iw_ioctl_siwessid(struct net_device *dev,
 159         OS_802_11_SSID essid;
 160         OS_802_11_MAC_ADDRESS bssid = { 0xff,0xff,0xff,0xff,0xff,0xff };
 161
 162 -#if IOCTL_DBG
 163 +#ifdef IOCTL_DBG
 164         printk("%s Call\n", __FUNCTION__);
 165  #endif
 166
 167 @@ -645,7 +645,7 @@ static int iw_ioctl_giwessid(struct net_device *dev,
 168         ULONG len=36;
 169         OS_802_11_SSID ssid;
 170
 171 -#if IOCTL_DBG
 172 +#ifdef IOCTL_DBG
 173         printk("%s Call\n", __FUNCTION__);
 174  #endif
 175         memset(&ssid, 0, sizeof(OS_802_11_SSID));
 176 @@ -664,7 +664,7 @@ static int iw_ioctl_siwmode(struct net_device *dev,
 177         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 178         u32 val;
 179
 180 -#if IOCTL_DBG
 181 +#ifdef IOCTL_DBG
 182         printk("%s Call\n", __FUNCTION__);
 183  #endif
 184         if (*mode > IW_MODE_INFRA)
 185 @@ -698,7 +698,7 @@ static int iw_ioctl_giwmode(struct net_device *dev,
 186         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 187         ULONG val, len;
 188
 189 -#if IOCTL_DBG
 190 +#ifdef IOCTL_DBG
 191         printk("%s Call\n", __FUNCTION__);
 192  #endif
 193      UtilInfrastructureModeGet(pAdapter, (UINT8 *)&val, &len);
 194 @@ -856,7 +856,7 @@ static int iw_ioctl_siwpower(struct net_device *dev,
 195         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 196         UINT32 val=POWER_MODE_ACTIVE;
 197
 198 -#if IOCTL_DBG
 199 +#ifdef IOCTL_DBG
 200         printk("%s Call\n", __FUNCTION__);
 201  #endif
 202
 203 @@ -898,7 +898,7 @@ static int iw_ioctl_giwpower(struct net_device *dev,
 204         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 205         UINT32 val=POWER_MODE_ACTIVE, len;
 206
 207 -#if IOCTL_DBG
 208 +#ifdef IOCTL_DBG
 209         printk("%s Call\n", __FUNCTION__);
 210  #endif
 211         UtilPowerModeGet(pAdapter, (UINT8 *)&val, &len);
 212 @@ -920,7 +920,7 @@ static int iw_ioctl_siwretry(struct net_device *dev,
 213  {
 214         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 215
 216 -#if IOCTL_DBG
 217 +#ifdef IOCTL_DBG
 218         printk("%s Call\n", __FUNCTION__);
 219  #endif
 220         if (rrq->disabled)
 221 @@ -949,7 +949,7 @@ static int iw_ioctl_giwretry(struct net_device *dev,
 222         u16 shortretry, longretry;
 223         ULONG len;
 224
 225 -#if IOCTL_DBG
 226 +#ifdef IOCTL_DBG
 227         printk("%s Call\n", __FUNCTION__);
 228  #endif
 229         if (UtilShortRetryGet(pAdapter, (UINT8 *)&shortretry, &len)!=0 ||
 230 @@ -990,7 +990,7 @@ static int iw_ioctl_giwtxpow(struct net_device *dev,
 231         INT8 val;
 232         ULONG len;
 233
 234 -#if IOCTL_DBG
 235 +#ifdef IOCTL_DBG
 236         printk("%s Call\n", __FUNCTION__);
 237  #endif
 238
 239 @@ -1012,7 +1012,7 @@ static int iw_ioctl_siwscan(struct net_device *dev,
 240         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 241         int ret;
 242
 243 -#if IOCTL_DBG
 244 +#ifdef IOCTL_DBG
 245         printk("%s Call\n", __FUNCTION__);
 246  #endif
 247
 248 @@ -1046,7 +1046,7 @@ static inline int iw_scan_list(struct net_device *dev,
 249         u8 *pos;
 250         spinlock_t lock;
 251
 252 -#if IOCTL_DBG
 253 +#ifdef IOCTL_DBG
 254         printk("%s Call\n", __FUNCTION__);
 255  #endif
 256         memset(list_buf, 0, 10000);
 257 @@ -1182,7 +1182,6 @@ static inline int iw_scan_list(struct net_device *dev,
 258                         spin_unlock_bh(&lock);
 259                         return -E2BIG;
 260                 }
 261 -               printk("current_ev=%x\n", current_ev);
 262          bssid = (OS_802_11_BSSID_EX *) (((char *) bssid) + bssid->Length);
 263         }
 264
 265 @@ -1198,7 +1197,7 @@ static int iw_ioctl_giwscan(struct net_device *dev,
 266         u32                                     val, len;
 267         int                                     res;
 268
 269 -#if IOCTL_DBG
 270 +#ifdef IOCTL_DBG
 271         printk("%s Call\n", __FUNCTION__);
 272  #endif
 273  #if 0
 274 @@ -1447,7 +1446,7 @@ static int iw_ioctl_siwauth(struct net_device *dev,
 275         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 276         u32 val, len;
 277
 278 -#if IOCTL_DBG
 279 +#ifdef IOCTL_DBG
 280         printk("%s Call\n", __FUNCTION__);
 281  #endif
 282         switch (data->flags & IW_AUTH_INDEX) {
 283 @@ -1517,7 +1516,7 @@ static int iw_ioctl_giwauth(struct net_device *dev,
 284         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 285         u32 val, len;
 286
 287 -#if IOCTL_DBG
 288 +#ifdef IOCTL_DBG
 289         printk("%s Call\n", __FUNCTION__);
 290  #endif
 291         switch (data->flags & IW_AUTH_INDEX) {
 292 @@ -1557,7 +1556,7 @@ static int iw_ioctl_siwencodeext(struct net_device *dev,
 293                                      struct iw_point *erq, char *extra)
 294  {
 295
 296 -#if IOCTL_DBG
 297 +#ifdef IOCTL_DBG
 298         printk("%s Call\n", __FUNCTION__);
 299  #endif
 300  #if 0
 301 @@ -1734,7 +1733,7 @@ static int iw_ioctl_giwencodeext(struct net_device *dev,
 302                                      struct iw_request_info *info,
 303                                      struct iw_point *erq, char *extra)
 304  {
 305 -#if IOCTL_DBG
 306 +#ifdef IOCTL_DBG
 307         printk("%s Call\n", __FUNCTION__);
 308  #endif
 309  #if 0
 310 @@ -1812,7 +1811,7 @@ static int iw_ioctl_siwgenie(struct net_device *dev,
 311                                  struct iw_request_info *info,
 312                                  struct iw_point *data, char *extra)
 313  {
 314 -#if IOCTL_DBG
 315 +#ifdef IOCTL_DBG
 316         printk("%s Call\n", __FUNCTION__);
 317  #endif
 318                 return -EOPNOTSUPP;
 319 @@ -1823,7 +1822,7 @@ static int iw_ioctl_giwgenie(struct net_device *dev,
 320                                  struct iw_request_info *info,
 321                                  struct iw_point *data, char *extra)
 322  {
 323 -#if IOCTL_DBG
 324 +#ifdef IOCTL_DBG
 325         printk("%s Call\n", __FUNCTION__);
 326  #endif
 327                 return -EOPNOTSUPP;
 328 @@ -1835,7 +1834,7 @@ static int iw_ioctl_siwmlme(struct net_device *dev,
 329                                 struct iw_request_info *info,
 330                                 struct iw_point *data, char *extra)
 331  {
 332 -#if IOCTL_DBG
 333 +#ifdef IOCTL_DBG
 334         printk("%s Call\n", __FUNCTION__);
 335  #endif
 336                 return -EOPNOTSUPP;
 337 @@ -1921,7 +1920,7 @@ static const struct iw_handler_def ti_iw_handler_def =
 338         .standard       = (iw_handler *) ti_handler,
 339  //     .private        = (iw_handler *) ti_private_handler,
 340  //     .private_args   = (struct iw_priv_args *) ti_priv,
 341 -       .get_wireless_stats = ti_get_wireless_stats,
 342 +//     .get_wireless_stats = ti_get_wireless_stats,
 343  };
 344
 345  void tiwlan_iwhandler_init(struct net_device *dev)
 346 --
 347 1.6.3.1
 348