[kismac] [binaervarianz] r176 - in branches/usb-drivers/Sources: Driver/USBJack WaveDrivers
- From: svn@xxxxxxxxxxxxxxxx
- To: kismac@xxxxxxxxxxxxx
- Date: Tue, 29 Aug 2006 04:05:09 +0200
Author: gkruse
Date: 2006-08-29 04:05:05 +0200 (Tue, 29 Aug 2006)
New Revision: 176
Modified:
branches/usb-drivers/Sources/Driver/USBJack/RalinkJack.mm
branches/usb-drivers/Sources/Driver/USBJack/USBJack.h
branches/usb-drivers/Sources/Driver/USBJack/USBJack.mm
branches/usb-drivers/Sources/WaveDrivers/WaveDriverUSBIntersil.mm
Log:
Latest and greatest, still no worky
Modified: branches/usb-drivers/Sources/Driver/USBJack/RalinkJack.mm
===================================================================
--- branches/usb-drivers/Sources/Driver/USBJack/RalinkJack.mm 2006-08-28
18:19:13 UTC (rev 175)
+++ branches/usb-drivers/Sources/Driver/USBJack/RalinkJack.mm 2006-08-29
02:05:05 UTC (rev 176)
@@ -15,6 +15,7 @@
unsigned short temp;
unsigned char Value = 0xff;
unsigned int i;
+ IOReturn ret;
NSLog(@"--> NICInitializeAsic");
@@ -68,9 +69,9 @@
//lets mess with the leds to verify we have control
RTUSBWriteMACRegister(MAC_CSR20, 0x002); //put led under
software control
-
- RTUSBWriteMACRegister(MAC_CSR1, 4);
- RTUSBReadMACRegister(MAC_CSR0, &temp);
+
+ RTUSBWriteMACRegister(MAC_CSR1, 4); //host is ready to work
+ RTUSBReadMACRegister(MAC_CSR0, &temp); //read the asic
version number
if ( temp >= 3){
RTUSBReadMACRegister(PHY_CSR2, &temp);
RTUSBWriteMACRegister(PHY_CSR2, temp & 0xFFFD);
@@ -80,6 +81,7 @@
NSLog(@"LNA 3 mode\n");
RTUSBWriteMACRegister(PHY_CSR2, 0x3002); // LNA 3 mode
}
+ //power save stuff
RTUSBWriteMACRegister(MAC_CSR11, 2);
RTUSBWriteMACRegister(MAC_CSR22, 0x53);
RTUSBWriteMACRegister(MAC_CSR15, 0x01ee);
@@ -97,12 +99,12 @@
//set RF_LE to low when standby
RTUSBReadMACRegister(PHY_CSR4, &temp);
RTUSBWriteMACRegister(PHY_CSR4, temp | 1);
- //NdisMSleep(1);//wait for PLL to become stable
+ //NdisMSleep(100);//wait for PLL to become stable
i = 0;
do
{
- RTUSBReadBBPRegister(BBP_Version, &Value);
+ ret = RTUSBReadBBPRegister(BBP_Version, &Value);
NSLog(@"Read BBP_Version Value = %d\n", Value);
i++;
}while (((Value == 0xff) || (Value == 0x00)) && (i < 50));
@@ -142,19 +144,9 @@
//AsicSwitchChannel(pAdapter, pAdapter->PortCfg.Channel);
//AsicLockChannel(pAdapter, pAdapter->PortCfg.Channel);
- // Add radio off control
- /*if (pAdapter->PortCfg.bRadio == FALSE)
- {
- RTUSBWriteMACRegister(pAdapter, MAC_CSR13, 0);
- RTUSBWriteMACRegister(pAdapter, MAC_CSR14, 0);
-
- RTMP_SET_FLAG(pAdapter, fRTMP_ADAPTER_RADIO_OFF);
- DBGPRINT(RT_DEBUG_ERROR, "1Set fRTMP_ADAPTER_RADIO_OFF ");
- }*/
-
-
//RTUSBMultiRead(STA_CSR0, buffer, 22);
-
+ UInt32 numBytesRead = sizeof(_recieveBuffer);
+ (*_interface)->ReadPipeAsync(_interface, kInPipe, &_recieveBuffer,
numBytesRead, (IOAsyncCallback1)_interruptRecieved, this);
NSLog(@"<-- NICInitializeAsic\n");
return kIOReturnSuccess;
}
@@ -167,7 +159,7 @@
UInt16 wLength) {
IOReturn ret;
- char buf[10];
+ char * buf;
if (!_devicePresent)
{
@@ -190,10 +182,11 @@
//we need to swap
//this is going to be bad when we run on intel
+ buf = (char*) malloc(sizeof(char) * wLength);
swab(theRequest.pData, buf, wLength);
memcpy(pData, buf,wLength);
+ free(buf);
-
}
return ret;
}
@@ -234,8 +227,7 @@
if (Offset == TXRX_CSR2)
NSLog(@" !!!!!set Rx control = %x\n", Value);
- Status = RTUSB_VendorRequest(
- kUSBOut,
+ Status = RTUSB_VendorRequest(kUSBOut,
0x2,
Value,
Offset + 0x400,
@@ -264,11 +256,17 @@
PHY_CSR7_STRUC PhyCsr7;
unsigned short temp;
unsigned int i = 0;
+ IOReturn ret;
PhyCsr7.value = 0;
PhyCsr7.field.WriteControl = 1;
PhyCsr7.field.RegID = Id;
- RTUSBWriteMACRegister(PHY_CSR7, PhyCsr7.value);
+ ret = RTUSBWriteMACRegister(PHY_CSR7, PhyCsr7.value);
+
+ if (ret!= kIOReturnSuccess) {
+ NSLog(@"Error Reading the BBP Register.");
+ return ret;
+ }
do
{
@@ -285,10 +283,10 @@
return kIOReturnNotResponding;
}
- RTUSBReadMACRegister(PHY_CSR7, (unsigned short *)&PhyCsr7);
+ ret = RTUSBReadMACRegister(PHY_CSR7, (unsigned short*)&PhyCsr7);
*pValue = (unsigned char)PhyCsr7.field.Data;
- return kIOReturnSuccess;
+ return ret;
}
Modified: branches/usb-drivers/Sources/Driver/USBJack/USBJack.h
===================================================================
--- branches/usb-drivers/Sources/Driver/USBJack/USBJack.h 2006-08-28
18:19:13 UTC (rev 175)
+++ branches/usb-drivers/Sources/Driver/USBJack/USBJack.h 2006-08-29
02:05:05 UTC (rev 176)
@@ -40,7 +40,7 @@
virtual bool setChannel(UInt16 channel);
bool devicePresent();
- WLFrame *recieveFrame();
+ WLFrame * receiveFrame();
bool sendFrame(UInt8* data);
void startMatching();
Modified: branches/usb-drivers/Sources/Driver/USBJack/USBJack.mm
===================================================================
--- branches/usb-drivers/Sources/Driver/USBJack/USBJack.mm 2006-08-28
18:19:13 UTC (rev 175)
+++ branches/usb-drivers/Sources/Driver/USBJack/USBJack.mm 2006-08-29
02:05:05 UTC (rev 176)
@@ -117,7 +117,7 @@
return _devicePresent;
}
-WLFrame *USBJack::recieveFrame() {
+WLFrame * USBJack::receiveFrame() {
WLFrame* ret;
if (!_devicePresent) return NULL;
Modified: branches/usb-drivers/Sources/WaveDrivers/WaveDriverUSBIntersil.mm
===================================================================
--- branches/usb-drivers/Sources/WaveDrivers/WaveDriverUSBIntersil.mm
2006-08-28 18:19:13 UTC (rev 175)
+++ branches/usb-drivers/Sources/WaveDrivers/WaveDriverUSBIntersil.mm
2006-08-29 02:05:05 UTC (rev 176)
@@ -139,7 +139,7 @@
- (WLFrame*) nextFrame {
WLFrame *f;
- // f = _driver->receiveFrame();
+ f = _driver->receiveFrame();
if (f==NULL) {
_errors++;
if (_packets && _driver) {
Other related posts:
- » [kismac] [binaervarianz] r176 - in branches/usb-drivers/Sources: Driver/USBJack WaveDrivers