Changeset 1008

Show
Ignore:
Timestamp:
11/18/08 20:35:33 (7 weeks ago)
Author:
liamMT
Message:

- trying to get the USB to come up

Location:
firmware/branches/cpp
Files:
7 modified

Legend:

Unmodified
Added
Removed

  • firmware/branches/cpp/core/usb/device/cdc-serial/CDCDSerialDriver.c

    r1006 r1008  
    4141#include "CDCDSerialDriver.h" 
    4242#include "CDCDSerialDriverDescriptors.h" 
     43#include "USBDCallbacks.h" 
    4344// #include <utility/trace.h> 
    4445// #include <utility/assert.h> 
    … …  
    141142    //           isDTEPresent); 
    142143 
     144    (void)isDTEPresent; 
    143145    cdcdSerialDriver.isCarrierActivated = activateCarrier; 
    144146    USBD_Write(0, 0, 0, 0, 0); 

  • firmware/branches/cpp/core/usb/device/core/USBDCallbacks.h

    r1006 r1008  
    6464            received. Does nothing by default. 
    6565*/ 
    66 void USBDCallbacks_Initialized(void); 
    67 void USBDCallbacks_Reset(void); 
    68 void USBDCallbacks_Suspended(void); 
    69 void USBDCallbacks_Resumed(void); 
    70 void USBDCallbacks_RequestReceived(const USBGenericRequest *request); 
     66extern void USBDCallbacks_Initialized(void); 
     67extern void USBDCallbacks_Reset(void); 
     68extern void USBDCallbacks_Suspended(void); 
     69extern void USBDCallbacks_Resumed(void); 
     70extern void USBDCallbacks_RequestReceived(const USBGenericRequest *request); 
    7171 
    7272#endif //#ifndef USBDCALLBACKS_H 

  • firmware/branches/cpp/core/usb/device/core/USBDDriverCallbacks_ConfigurationChanged.c

    r1006 r1008  
    4646{ 
    4747    // trace_LOG(trace_INFO, "ConfigurationChanged "); 
     48  (void)cfgnum; 
    4849} 
    4950 

  • firmware/branches/cpp/core/usb/device/core/USBD_UDP.c

    r1006 r1008  
    11631163    #error Unsupported pull-up type. 
    11641164#endif 
     1165  AT91C_BASE_PIOA->PIO_PER = AT91C_PIO_PA10; 
     1166  AT91C_BASE_PIOA->PIO_ODR = AT91C_PIO_PA10; 
     1167   
     1168  AT91C_BASE_PIOA->PIO_PER = AT91C_PIO_PA11; 
     1169  AT91C_BASE_PIOA->PIO_OER = AT91C_PIO_PA11; 
     1170  AT91C_BASE_PIOA->PIO_CODR = AT91C_PIO_PA11; 
    11651171} 
    11661172 

  • firmware/branches/cpp/libraries/appled/appled_cpp.h

    r971 r1008  
    2727  #include "config.h" 
    2828} 
     29 
     30#include "io_cpp.h" 
    2931 
    3032/* AppLed Functions */ 

  • firmware/branches/cpp/projects/heavy/Makefile

    r1006 r1008  
    150150-I../../core/freertos/portable/GCC/ARM7_AT91SAM7S  \ 
    151151-I$(LWIP)/src/include/ipv4 \ 
    152 -I../../core/usb/device/cdc-serial \ 
    153 -I../../core/usb/device/core \ 
    154 -I../../core/usb/common/core \ 
    155 -I../../core/usb/common/cdc 
     152-I$(USB)/device/cdc-serial \ 
     153-I$(USB)/device/core \ 
     154-I$(USB)/common/core \ 
     155-I$(USB)/common/cdc 
    156156 
    157157############################################################################ 

  • firmware/branches/cpp/projects/heavy/make_.cpp

    r970 r1008  
    2626#include "led_cpp.h" 
    2727#include "appled_cpp.h" 
     28#include "usb_.h" 
    2829 
    2930void BlinkTask( void* parameters ); 
    … …  
    3435 
    3536  // Do this right quick after booting up - otherwise we won't be recognised 
    36   Usb_SetActive( 1 ); 
     37  // Usb_SetActive( 1 ); 
     38  // Led_SetState( ); 
     39  USB::init(); 
    3740 
    3841  // Fire up the OSC system and register the subsystems you want to use