Diff for /qemu/hw/omap.h between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2018/04/24 16:54:00 version 1.1.1.3, 2018/04/24 17:25:09
Line 14 Line 14
  * GNU General Public License for more details.   * GNU General Public License for more details.
  *   *
  * You should have received a copy of the GNU General Public License along   * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,   * with this program; if not, see <http://www.gnu.org/licenses/>.
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  
  */   */
 #ifndef hw_omap_h  #ifndef hw_omap_h
 # define hw_omap_h              "omap.h"  # define hw_omap_h              "omap.h"
Line 490  struct omap_dma_lcd_channel_s { Line 489  struct omap_dma_lcd_channel_s {
     int dual;      int dual;
   
     int current_frame;      int current_frame;
     ram_addr_t phys_framebuffer[2];      target_phys_addr_t phys_framebuffer[2];
     qemu_irq irq;      qemu_irq irq;
     struct omap_mpu_state_s *mpu;      struct omap_mpu_state_s *mpu;
 } *omap_dma_get_lcdch(struct soc_dma_s *s);  } *omap_dma_get_lcdch(struct soc_dma_s *s);
Line 681  struct omap_gpif_s *omap2_gpio_init(stru Line 680  struct omap_gpif_s *omap2_gpio_init(stru
 qemu_irq *omap2_gpio_in_get(struct omap_gpif_s *s, int start);  qemu_irq *omap2_gpio_in_get(struct omap_gpif_s *s, int start);
 void omap2_gpio_out_set(struct omap_gpif_s *s, int line, qemu_irq handler);  void omap2_gpio_out_set(struct omap_gpif_s *s, int line, qemu_irq handler);
   
 struct uwire_slave_s {  struct uWireSlave {
     uint16_t (*receive)(void *opaque);      uint16_t (*receive)(void *opaque);
     void (*send)(void *opaque, uint16_t data);      void (*send)(void *opaque, uint16_t data);
     void *opaque;      void *opaque;
Line 690  struct omap_uwire_s; Line 689  struct omap_uwire_s;
 struct omap_uwire_s *omap_uwire_init(target_phys_addr_t base,  struct omap_uwire_s *omap_uwire_init(target_phys_addr_t base,
                 qemu_irq *irq, qemu_irq dma, omap_clk clk);                  qemu_irq *irq, qemu_irq dma, omap_clk clk);
 void omap_uwire_attach(struct omap_uwire_s *s,  void omap_uwire_attach(struct omap_uwire_s *s,
                 struct uwire_slave_s *slave, int chipselect);                  uWireSlave *slave, int chipselect);
   
 struct omap_mcspi_s;  struct omap_mcspi_s;
 struct omap_mcspi_s *omap_mcspi_init(struct omap_target_agent_s *ta, int chnum,  struct omap_mcspi_s *omap_mcspi_init(struct omap_target_agent_s *ta, int chnum,
Line 703  struct omap_rtc_s; Line 702  struct omap_rtc_s;
 struct omap_rtc_s *omap_rtc_init(target_phys_addr_t base,  struct omap_rtc_s *omap_rtc_init(target_phys_addr_t base,
                 qemu_irq *irq, omap_clk clk);                  qemu_irq *irq, omap_clk clk);
   
 struct i2s_codec_s {  struct I2SCodec {
     void *opaque;      void *opaque;
   
     /* The CPU can call this if it is generating the clock signal on the      /* The CPU can call this if it is generating the clock signal on the
Line 730  struct i2s_codec_s { Line 729  struct i2s_codec_s {
 struct omap_mcbsp_s;  struct omap_mcbsp_s;
 struct omap_mcbsp_s *omap_mcbsp_init(target_phys_addr_t base,  struct omap_mcbsp_s *omap_mcbsp_init(target_phys_addr_t base,
                 qemu_irq *irq, qemu_irq *dma, omap_clk clk);                  qemu_irq *irq, qemu_irq *dma, omap_clk clk);
 void omap_mcbsp_i2s_attach(struct omap_mcbsp_s *s, struct i2s_codec_s *slave);  void omap_mcbsp_i2s_attach(struct omap_mcbsp_s *s, I2SCodec *slave);
   
 struct omap_lpg_s;  struct omap_lpg_s;
 struct omap_lpg_s *omap_lpg_init(target_phys_addr_t base, omap_clk clk);  struct omap_lpg_s *omap_lpg_init(target_phys_addr_t base, omap_clk clk);
Line 1116  static void io_writew(void *opaque, targ Line 1115  static void io_writew(void *opaque, targ
 static CPUReadMemoryFunc *io_readfn[] = { io_readb, io_readh, io_readw, };  static CPUReadMemoryFunc *io_readfn[] = { io_readb, io_readh, io_readw, };
 static CPUWriteMemoryFunc *io_writefn[] = { io_writeb, io_writeh, io_writew, };  static CPUWriteMemoryFunc *io_writefn[] = { io_writeb, io_writeh, io_writew, };
   
 inline static int debug_register_io_memory(int io_index,  inline static int debug_register_io_memory(
                 CPUReadMemoryFunc **mem_read, CPUWriteMemoryFunc **mem_write,                  CPUReadMemoryFunc **mem_read, CPUWriteMemoryFunc **mem_write,
                 void *opaque)                  void *opaque)
 {  {
Line 1126  inline static int debug_register_io_memo Line 1125  inline static int debug_register_io_memo
     s->mem_write = mem_write;      s->mem_write = mem_write;
     s->opaque = opaque;      s->opaque = opaque;
     s->in = 0;      s->in = 0;
     return cpu_register_io_memory(io_index, io_readfn, io_writefn, s);      return cpu_register_io_memory(io_readfn, io_writefn, s);
 }  }
 #  define cpu_register_io_memory        debug_register_io_memory  #  define cpu_register_io_memory        debug_register_io_memory
 # endif  # endif
Line 1136  inline static int debug_register_io_memo Line 1135  inline static int debug_register_io_memo
   
 # ifdef L4_MUX_HACK  # ifdef L4_MUX_HACK
 #  undef l4_register_io_memory  #  undef l4_register_io_memory
 int l4_register_io_memory(int io_index, CPUReadMemoryFunc **mem_read,  int l4_register_io_memory(CPUReadMemoryFunc **mem_read,
                 CPUWriteMemoryFunc **mem_write, void *opaque);                  CPUWriteMemoryFunc **mem_write, void *opaque);
 # endif  # endif
   

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3


unix.superglobalmegacorp.com