org.handhelds.familiar/packages/zd1211/zd1211-4916/usb-endian.patch

   1 diff -ur zdold/Makefile zd1211-4916-r0/Makefile
   2 --- zdold/Makefile      2005-02-18 21:58:36.000000000 -0800
   3 +++ zd1211-4916-r0/Makefile     2005-02-28 17:59:05.000000000 -0800
   4 @@ -149,7 +149,7 @@
   5  CFLAGS += -DfNEW_CODE_MAP=1\r
   6  CFLAGS += -DfWRITE_WORD_REG=1\r
   7  CFLAGS += -DfREAD_MUL_REG=1\r
   8 -#CFLAGS += -DENHANCE_RX=1\r
   9 +CFLAGS += -DENHANCE_RX=1\r
  10  \r
  11  all: $(MODULE)\r
  12  \r
  13 diff -ur zdold/src/zd1211.c zd1211-4916-r0/src/zd1211.c
  14 --- zdold/src/zd1211.c  2005-01-28 22:55:15.000000000 -0800
  15 +++ zd1211-4916-r0/src/zd1211.c 2005-03-01 14:41:07.003613776 -0800
  16 @@ -429,16 +429,16 @@
  17                 memset(pRegBuffer, 0x0, size);                     \r
  18  \r
  19   \r
  20 -    ((PUSB_WRITE_REG)pRegBuffer)->RequestID = REGID_PROG_FLSH;\r
  21 -    ((PUSB_SET_RF) pRegBuffer)->Value       = Value[0];\r
  22 -    ((PUSB_SET_RF) pRegBuffer)->Index       = Value[1];\r
  23 +    ((PUSB_WRITE_REG)pRegBuffer)->RequestID = cpu_to_le16(REGID_PROG_FLSH);\r
  24 +    ((PUSB_SET_RF) pRegBuffer)->Value       = cpu_to_le16(Value[0]);\r
  25 +    ((PUSB_SET_RF) pRegBuffer)->Index       = cpu_to_le16(Value[1]);\r
  26  \r
  27  \r
  28  \r
  29  \r
  30  \r
  31      for (ii = 2; ii < RegCount; ii ++)\r
  32 -       ((PUSB_SET_RF)pRegBuffer)->Data[ii - 2] = Value[ii];\r
  33 +       ((PUSB_SET_RF)pRegBuffer)->Data[ii - 2] = cpu_to_le16(Value[ii]);\r
  34  \r
  35      \r
  36      bufSize = sizeof(u16) * (1+RegCount);\r
  37 @@ -513,7 +513,7 @@
  38         }else\r
  39                 memset(pRegBuffer, 0x0, size);\r
  40  \r
  41 -    ((PUSB_READ_REG_REQ)pRegBuffer)->RequestID  = REGID_READ;\r
  42 +       ((PUSB_READ_REG_REQ)pRegBuffer)->RequestID  = cpu_to_le16(REGID_READ);\r
  43  \r
  44      \r
  45  \r
  46 @@ -526,7 +526,7 @@
  47          else if ((Address[ii] & BASE_ADDR_MASK_HOST) == USB_BASE_ADDR_EEPROM)\r
  48             Address[ii] = ((Address[ii] - USB_BASE_ADDR_EEPROM) / 2) + cFIRMWARE_EEPROM_OFFSET;\r
  49                                           //0x9900                     //0xF817\r
  50 -        ((PUSB_READ_REG_REQ) pRegBuffer)->Address[ii] = Address[ii];\r
  51 +        ((PUSB_READ_REG_REQ) pRegBuffer)->Address[ii] = cpu_to_le16(Address[ii]);\r
  52  \r
  53      }\r
  54  \r
  55 @@ -608,7 +608,7 @@
  56      }    \r
  57      else {\r
  58          for (ii = 0; ii < (macp->ReadRegCount-2) / 4; ii++){\r
  59 -            pValue[ii] = *((u16 *) macp->IntEPBuffer2 + 1 + ii * 2 + 1);\r
  60 +         pValue[ii] = le16_to_cpu(*((u16 *) macp->IntEPBuffer2 + 1 + ii * 2 + 1));
  61          }    \r
  62          ret = 0;    \r
  63  \r
  64 @@ -686,7 +686,7 @@
  65      }    \r
  66  \r
  67         down(&macp->reg_sem);       \r
  68 -               \r
  69 +\r
  70  \r
  71  \r
  72      if ((RegCount == 0) || (!macp->bUSBDeveiceAttached) || !test_bit(ZD1211_RUNNING, &macp->flags)) {  \r
  73 @@ -712,7 +712,7 @@
  74  \r
  75  \r
  76  \r
  77 -       ((PUSB_WRITE_REG)pRegBuffer)->RequestID = REGID_WRITE;\r
  78 +       ((PUSB_WRITE_REG)pRegBuffer)->RequestID = cpu_to_le16(REGID_WRITE);\r
  79  \r
  80      if (RegCount > cMIN_MULTI_WRITE_REG_NUM){\r
  81          for (i=cMIN_MULTI_WRITE_REG_NUM; i<RegCount; i++){\r
  82 @@ -724,8 +724,8 @@
  83              else if ((Address[i] & BASE_ADDR_MASK_HOST) == USB_BASE_ADDR_EEPROM)\r
  84                  Address[i] = ((Address[i] - USB_BASE_ADDR_EEPROM) / 2) + cFIRMWARE_EEPROM_OFFSET;\r
  85  \r
  86 -            ((PUSB_WRITE_REG)pRegBuffer)->WritePackage[i].Address = Address[i];\r
  87 -            ((PUSB_WRITE_REG)pRegBuffer)->WritePackage[i].WriteData_low = Value[i];\r
  88 +            ((PUSB_WRITE_REG)pRegBuffer)->WritePackage[i].Address = cpu_to_le16(Address[i]);\r
  89 +            ((PUSB_WRITE_REG)pRegBuffer)->WritePackage[i].WriteData_low = cpu_to_le16(Value[i]);\r
  90           }\r
  91      }\r
  92  \r
  93 @@ -1726,17 +1726,17 @@
  94  \r
  95  \r
  96  \r
  97 -       ((PUSB_SET_RF)pRegBuffer)->RequestID = REGID_RFOFDMSET;\r
  98 +       ((PUSB_SET_RF)pRegBuffer)->RequestID = cpu_to_le16(REGID_RFOFDMSET);\r
  99         \r
 100         if (bIs3683A)\r
 101 -               ((PUSB_SET_RF)pRegBuffer)->Value = 1;\r
 102 +               ((PUSB_SET_RF)pRegBuffer)->Value = cpu_to_le16(1);\r
 103         else\r
 104 -               ((PUSB_SET_RF)pRegBuffer)->Value = 2;\r
 105 +               ((PUSB_SET_RF)pRegBuffer)->Value = cpu_to_le16(2);\r
 106         \r
 107 -       ((PUSB_SET_RF)pRegBuffer)->Index = (u16)S_bit_cnt;\r
 108 +       ((PUSB_SET_RF)pRegBuffer)->Index = cpu_to_le16((u16)S_bit_cnt);\r
 109  \r
 110      for (i = 0; i < S_bit_cnt; i ++)\r
 111 -        ((PUSB_SET_RF)pRegBuffer)->Data[i] = InputValue[i];\r
 112 +        ((PUSB_SET_RF)pRegBuffer)->Data[i] = cpu_to_le16(InputValue[i]);\r
 113  \r
 114  \r
 115         bufSize = sizeof(u16) * (3+S_bit_cnt);\r
 116 @@ -2229,7 +2229,7 @@
 117  \r
 118  \r
 119  \r
 120 -    ZD1211DEBUG(4, "actual_length = %x\n", urb->actual_length);\r
 121 +    ZD1211DEBUG(2, "actual_length = %x\n", urb->actual_length);\r
 122  \r
 123  \r
 124         rx_struct = list_entry(macp->active_rx_list.next,\r
 125 @@ -2266,7 +2266,7 @@
 126      if (last_pkt_len <= (macp->wMaxPacketSize - 4)){\r
 127  \r
 128  \r
 129 -       if (((u16 *) pRxBuffer)[TotalLength / sizeof(u16) - 1] == 0x697E){\r
 130 +       if (le16_to_cpu(((u16 *) pRxBuffer)[TotalLength / sizeof(u16) - 1]) == 0x697E){\r
 131  \r
 132              total_rx_struct = 3;\r
 133              //ZD1211DEBUG(0, "Got merged Rx Frames!!\n");\r
 134 @@ -2288,8 +2288,8 @@
 135              int CurFrmLen;\r
 136  \r
 137              if (total_rx_struct> 1){\r
 138 -                CurFrmLen = ((u16 *) pRxBuffer)[TotalLength / sizeof(u16) + i - 4];\r
 139 -                //ZD1211DEBUG(2, "CurFrmLen = %x\n", CurFrmLen);\r
 140 +                CurFrmLen = le16_to_cpu(((u16 *) pRxBuffer)[TotalLength / sizeof(u16) + i - 4]);\r
 141 +                //ZD1211DEBUG(2, "[RX] CurFrmLen = %x\n", CurFrmLen);\r
 142              }    \r
 143  \r
 144              else\r
 145 @@ -2316,22 +2316,22 @@
 146  \r
 147         \r
 148  \r
 149 -            rfd->CbStatus = RFD_STATUS_COMPLETE;\r
 150 -            rfd->ActualCount = CurFrmLen;\r
 151 +            rfd->CbStatus = cpu_to_le32(RFD_STATUS_COMPLETE);\r
 152 +            rfd->ActualCount = cpu_to_le32(CurFrmLen);\r
 153  \r
 154  \r
 155              if (i > 0){\r
 156                  memcpy(&rfd->RxBuffer[macp->rxOffset],\r
 157                         pRxBuffer + tmpLen,\r
 158 -                    rfd->ActualCount);\r
 159 +                    CurFrmLen);\r
 160  \r
 161              }        \r
 162  \r
 163  \r
 164 -            tmpLen += (rfd->ActualCount & ~0x03);\r
 165 +            tmpLen += (CurFrmLen & ~0x03);\r
 166  \r
 167  \r
 168 -            if (rfd->ActualCount & 0x03)\r
 169 +            if (CurFrmLen & 0x03)\r
 170                  tmpLen += 4;\r
 171  \r
 172         }\r
 173 @@ -2361,8 +2361,8 @@
 174  \r
 175  #else\r
 176  \r
 177 -    rfd->CbStatus = RFD_STATUS_COMPLETE;\r
 178 -    rfd->ActualCount = TotalLength;\r
 179 +    rfd->CbStatus = cpu_to_le32(RFD_STATUS_COMPLETE);\r
 180 +    rfd->ActualCount = cpu_to_le32(TotalLength);\r
 181      zd1205_rx_isr(macp);\r
 182  #endif\r
 183  \r
 184 @@ -2521,8 +2521,8 @@
 185                                 // this is USB_READ_REGISTER response\r
 186                     macp->ReadRegCount = (u16)actual_length;\r
 187  \r
 188 -                intNum = *(u16 *)(macp->IntEPBuffer+2);\r
 189 -                //intNum = macp->IntEPBuffer[2] + (((u16)macp->IntEPBuffer[3]) << 8);\r
 190 +                //intNum = *(u16 *)(macp->IntEPBuffer+2);\r
 191 +                intNum = macp->IntEPBuffer[2] + (((u16)macp->IntEPBuffer[3]) << 8);\r
 192                 \r
 193                  if (intNum == (InterruptCtrl | macp->USBCSRAddress)){   \r
 194                                         // Handle non-RxTx interrupt\r
 195 @@ -2549,8 +2549,8 @@
 196                         case EPINT_RetryFial_Event:\r
 197                         {\r
 198                                 u8 *pMacAddr = macp->IntEPBuffer + 4;\r
 199 -                               u8 NewRate = (u8)(*(u16 *)(macp->IntEPBuffer + 2));\r
 200 -                //u8 NewRate = macp->IntEPBuffer[2];\r
 201 +                               //u8 NewRate = (u8)(*(u16 *)(macp->IntEPBuffer + 2));\r
 202 +                u8 NewRate = (u8)macp->IntEPBuffer[2];\r
 203                                 u16 aid;\r
 204  \r
 205  \r
 206 @@ -2568,7 +2568,7 @@
 207                         //ZD1211DEBUG(2, "NewRate = %x\n", NewRate);\r
 208                         aid = zd_AidLookUp(pMacAddr);\r
 209                         zd_EventNotify(EVENT_TX_COMPLETE, ZD_RETRY_FAILED, 0xff, (U32)aid);\r
 210 -                               macp->retryFailCnt +=  *(u16 *)(macp->IntEPBuffer + 10);\r
 211 +                               macp->retryFailCnt +=  le16_to_cpu(*(u16 *)(macp->IntEPBuffer + 10));\r
 212                                 break;\r
 213  \r
 214                         }\r
 215 @@ -2634,7 +2634,7 @@
 216         // in current design, no need to use spinlock\r
 217  \r
 218  \r
 219 -       intr_status = *(u16 *)(macp->IntEPBuffer3+4);\r
 220 +       intr_status = le16_to_cpu(*(u16 *)(macp->IntEPBuffer3+4));\r
 221      //ZD1211DEBUG(2, "intr_status = %x\n", intr_status);\r
 222   \r
 223      if (!intr_status)\r
 224 @@ -2765,7 +2765,7 @@
 225  \r
 226         sw_tcb = macp->activeTxQ->first;\r
 227         if (sw_tcb) \r
 228 -               sw_tcb->pTcb->CbStatus = CB_STATUS_COMPLETE;\r
 229 +               sw_tcb->pTcb->CbStatus = cpu_to_le32(CB_STATUS_COMPLETE);\r
 230  \r
 231         zd1205_tx_isr(macp);\r
 232  \r
 233 @@ -2889,23 +2889,25 @@
 234         Tbd++;\r
 235  \r
 236         //Mac Header\r
 237 -       memcpy(dst, (u8 *)Tbd->TbdBufferAddrLowPart, Tbd->TbdCount);\r
 238 +       memcpy(dst, (u8 *)le32_to_cpu(Tbd->TbdBufferAddrLowPart),
 239 +              le32_to_cpu(Tbd->TbdCount));\r
 240  \r
 241      ZD1211DEBUG(2, "MAC Header Length = %x\n", Tbd->TbdCount);\r
 242 -       dst += Tbd->TbdCount;\r
 243 +       dst += le32_to_cpu(Tbd->TbdCount);\r
 244  \r
 245 -       TotalLength += Tbd->TbdCount;\r
 246 +       TotalLength += le32_to_cpu(Tbd->TbdCount);\r
 247  \r
 248         Tbd++;\r
 249  \r
 250         //MAC Body\r
 251 -       memcpy(dst, (u8 *)Tbd->TbdBufferAddrLowPart, Tbd->TbdCount);\r
 252 +       memcpy(dst, (u8 *)le32_to_cpu(Tbd->TbdBufferAddrLowPart),
 253 +              le32_to_cpu(Tbd->TbdCount));
 254  \r
 255      ZD1211DEBUG(2, "Tx DATA Length = %x\n", Tbd->TbdCount);\r
 256 -       dst += Tbd->TbdCount;\r
 257 +       dst += le32_to_cpu(Tbd->TbdCount);\r
 258  \r
 259  \r
 260 -       TotalLength += Tbd->TbdCount;\r
 261 +       TotalLength += le32_to_cpu(Tbd->TbdCount);\r
 262         Tbd++;\r
 263  \r
 264      ZD1211DEBUG(2, "TotalLength = %x\n", TotalLength);\r
 265 @@ -2914,7 +2916,7 @@
 266  \r
 267  \r
 268         // write down total length\r
 269 -       *((u16 *)(macp->tx_buff+4)) = (u16)TotalLength + 14;\r
 270 +       *((u16 *)(macp->tx_buff+4)) = cpu_to_le16((u16)TotalLength + 14);\r
 271  \r
 272         ZD1211DEBUG(2, "macp->tx_buff+4 = %x\n", *((u16 *)(macp->tx_buff+4)));\r
 273  \r
 274 diff -ur zdold/src/zd1211.h zd1211-4916-r0/src/zd1211.h
 275 --- zdold/src/zd1211.h  2005-01-28 22:55:14.000000000 -0800
 276 +++ zd1211-4916-r0/src/zd1211.h 2005-03-01 14:12:15.023914712 -0800
 277 @@ -146,7 +146,9 @@
 278  typedef struct _USB_WRITE_REG {\r
 279         u16  RequestID;\r
 280      USB_WRITE_REG_PACKAGE WritePackage[cMAX_MULTI_WRITE_REG_NUM];\r
 281 -} USB_WRITE_REG, * PUSB_WRITE_REG;\r
 282 +} __attribute__((__packed__));\r
 283 +\r
 284 +typedef struct _USB_WRITE_REG USB_WRITE_REG, * PUSB_WRITE_REG;\r
 285  \r
 286  \r
 287  typedef struct _USB_SET_RF {\r
 288 diff -ur zdold/src/zdshared.c zd1211-4916-r0/src/zdshared.c
 289 --- zdold/src/zdshared.c        2005-01-28 22:55:15.000000000 -0800
 290 +++ zd1211-4916-r0/src/zdshared.c       2005-03-01 14:43:35.078103032 -0800
 291 @@ -416,6 +416,7 @@
 292         U16 len;\r
 293         Frame_t *pf = pfrmDesc->mpdu;\r
 294         \r
 295 +       pf->header[2] = pf->header[3] = 0; // Initialize them to something?
 296         setFrameType(pf, ST_PROBE_REQ);\r
 297         pf->body = pfrmDesc->buffer;\r
 298         body = pf->body;\r