On Fri, Jul 24, 2009 at 11:46 AM, Bob Paddock<graceindustr...@gmail.com> wrote:
>>  * The XMEGA is realized.
>
>> At this moment the XMEGA is not tested.
>
> I do not understand this code in eewr_byte.S...

I have tested the attached code on my XMega128A1for eeprom_write_word
and eeprom_read_word,
with the version of eewr_byte.S attached.

eeprom_write_word calls eewr_byte.S twice, eewr_block would call
eewr_byte several times,
this will be *extremely* inefficient time wise on the XMega.

I did not test anything but write/read_word and implicitly write/read byte.

Using the XMega EEPROM mapping functions might shave a few cycles off
of the code for write,
it is already being used for read.
/* Copyright (c) 2009  Dmitry Xmelkov
   All rights reserved.

   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:

   * Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the
     distribution.
   * Neither the name of the copyright holders nor the names of
     contributors may be used to endorse or promote products derived
     from this software without specific prior written permission.

   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE.  */

/* $Id: eewr_byte.S,v 1.1 2009/06/05 23:03:21 dmix Exp $        */

#ifndef __DOXYGEN

#include <avr/io.h>

#if     E2END && __AVR_ARCH__ > 1

#include <avr/eeprom.h>
#include "asmdef.h"
#include "eedef.h"

ENTRY   eeprom_write_byte
        mov     r18, r22

ENTRY   eeprom_write_r18

#if  __AVR_XMEGA__      /* -------------------------------------------- */

# ifndef CCP_IOREG_gc
#  define CCP_IOREG_gc  0xD8    /* IO Register Protection       */
# endif
# ifndef NVM_CMD_READ_EEPROM_gc
#  define NVM_CMD_READ_EEPROM_gc        0x06
# endif
# ifndef NVM_CMD_LOAD_EEPROM_BUFFER_gc
#  define NVM_CMD_LOAD_EEPROM_BUFFER_gc 0x33
# endif
# ifndef NVM_CMD_ERASE_WRITE_EEPROM_PAGE_gc
#  define NVM_CMD_ERASE_WRITE_EEPROM_PAGE_gc 0x35
# endif
# ifndef  NVM_CMD_ERASE_EEPROM_BUFFER_gc
#  define NVM_CMD_ERASE_EEPROM_BUFFER_gc 0x36
#endif

        push r18

  ; Prepare base address of NVM.
        ldi     ZL, lo8(NVM_BASE)
        ldi     ZH, hi8(NVM_BASE)

  ; Wait until NVM is not busy.
1:      ldd     r19, Z + NVM_STATUS - NVM_BASE
        sbrc    r19, NVM_NVMBUSY_bp
        rjmp    1b

  ; Desable EEPROM mapping into data space.
        ldd     r19, Z + NVM_CTRLB - NVM_BASE
        andi    r19, ~NVM_EEMAPEN_bm
        std     Z + NVM_CTRLB - NVM_BASE, XL

  ; Erase the EEPROM page buffer if needed
        ldd     r19, Z + NVM_STATUS - NVM_BASE
        sbrs    r19, NVM_EELOAD_bp
        rjmp    3f

   ; Issue EEPROM Buffer Erase
        ldi     r18, NVM_CMD_ERASE_EEPROM_BUFFER_gc
        std     Z + NVM_CMD - NVM_BASE, r18
        ldi     r18, CCP_IOREG_gc
        ldi     r19, NVM_CMDEX_bm
        out     CCP, r18
        std     Z + NVM_CTRLA - NVM_BASE, r19

  ; Wait until NVM is not busy.
2:      ldd     r19, Z + NVM_STATUS - NVM_BASE
        sbrc    r19, NVM_NVMBUSY_bp
        rjmp    2b

    ; Issue EEPROM Buffer Load command.
3:
        pop r18
    ; Set address and data to write to.
        ldi     r19, NVM_CMD_LOAD_EEPROM_BUFFER_gc
        std     Z + NVM_CMD - NVM_BASE, r19
        std     Z + NVM_ADDR0 - NVM_BASE, addr_lo
        std     Z + NVM_ADDR1 - NVM_BASE, addr_hi
        std     Z + NVM_ADDR2 - NVM_BASE, __zero_reg__
        std     Z + NVM_DATA0 - NVM_BASE, r18 ; Writting to DATA0 starts the 
command

   ; Issue EEPROM Atomic Erase&Write command.
        ldi     r18, NVM_CMD_ERASE_WRITE_EEPROM_PAGE_gc
        std     Z + NVM_CMD - NVM_BASE, r18
        ldi     r18, CCP_IOREG_gc
        ldi     r19, NVM_CMDEX_bm
        out     CCP, r18
        std     Z + NVM_CTRLA - NVM_BASE, r19

  ; Increment address.
        adiw    addr_lo, 1

        ret

#else           /* ---------------------------------------------------- */

1:      sbic    _SFR_IO_ADDR (EECR), EEWE
        rjmp    1b

# if     defined (EEPM0) && defined (EEPM1)
        ; Set programming mode: erase and write.
        out     _SFR_IO_ADDR (EECR), __zero_reg__
# elif   defined (EEPM0) || defined (EEPM1)
#  error        /* Unknown EECR register.       */
# endif

# ifdef  EEARH
#  if     E2END > 0xFF
        out     _SFR_IO_ADDR (EEARH), addr_hi
#  else
        ; This is for chips like ATmega48: the EEAR8 bit must be cleaned.
        out     _SFR_IO_ADDR (EEARH), __zero_reg__
#  endif
# endif
        out     _SFR_IO_ADDR (EEARL), addr_lo
        out     _SFR_IO_ADDR (EEDR), r18
        in      __tmp_reg__, _SFR_IO_ADDR (SREG)
        cli
        sbi     _SFR_IO_ADDR (EECR), EEMWE
        sbi     _SFR_IO_ADDR (EECR), EEWE
        out     _SFR_IO_ADDR (SREG), __tmp_reg__
        adiw    addr_lo, 1
        ret

#endif          /* ---------------------------------------------------- */

ENDFUNC

#endif  /* E2END && __AVR_ARCH__ > 1 */
#endif  /* !__DOXYGEN__ */
_______________________________________________
AVR-libc-dev mailing list
AVR-libc-dev@nongnu.org
http://lists.nongnu.org/mailman/listinfo/avr-libc-dev

Reply via email to