Changeset 889

Show
Ignore:
Timestamp:
08/28/08 00:32:47 (3 months ago)
Author:
sonic74
Message:
 
Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/drv_D4D.c

    r888 r889  
    228228      cmd_sd[2] = (col + i) * XRES; 
    229229      sec = SECTOR + (unsigned char) data[i] * SECTOR_SIZE; 
    230       cmd_sd[9] = address_hi(sec); 
     230      cmd_sd[ 9] = address_hi (sec); 
    231231      cmd_sd[10] = address_mid(sec); 
    232       cmd_sd[11] = address_lo(sec); 
     232      cmd_sd[11] = address_lo (sec); 
    233233      drv_D4D_send_extra(cmd_sd, sizeof(cmd_sd), 3, 6); 
    234234  } 
     
    239239static void drv_D4D_defchar(const int ascii, const unsigned char *matrix) 
    240240{ 
    241 /* error("drv_D4D_defchar"); */ 
     241    /* error("drv_D4D_defchar"); */ 
    242242    char cmd[11]; 
    243243    int i; 
     
    256256static void drv_D4D_blit(const int row, const int col, const int height, const int width) 
    257257{ 
    258 /* error("drv_D4D_blit(%i, %i, %i, %i)",row, col, height, width); */ 
     258    /* error("drv_D4D_blit(%i, %i, %i, %i)",row, col, height, width); */ 
    259259    int r, c; 
    260260    RGBA rgb, pixel0_0, pixel; 
     
    285285  drv_D4D_send_extra(cmdRect, sizeof(cmdRect), 2, 5); 
    286286    } else { 
    287  
    288287  char cmd[] = { 'I', col, msb(row), lsb(row), width, msb(height), lsb(height), MODE }; 
    289288  drv_D4D_send_nowait_extra(cmd, sizeof(cmd), 2, 5); 
     
    302301        drv_D4D_send_nowait(colorArray, 1); 
    303302    } 
    304 /*      drv_D4D_send_nowait(colorArray, MODE/8); */ 
     303                /* drv_D4D_send_nowait(colorArray, MODE/8); */ 
    305304      } 
    306305  } 
     
    378377      res[i] = 96; 
    379378      break; 
    380   case 0x24: 
     379  case 0x24: /* undocumented? */ 
    381380      res[i] = 240; 
    382       break;    /* undocumented? */ 
     381      break; 
    383382  default: 
    384383      error("Can't detect display dimensions!"); 
     
    444443  DROWS = DROWS / YRES; 
    445444  switch (yres_cfg) { /* font in ROM */ 
    446   case 8:   /* FONT=1; break; */ 
     445  case 8: 
    447446      switch (xres_cfg) { 
    448447      case 6: 
     
    469468      return -1; 
    470469  } 
    471   /* if(xres_cfg==6) FONT=0; */ 
    472470    } 
    473471 
     
    482480  drv_D4D_send(powerOn, sizeof(powerOn)); 
    483481 
    484   /*! */ 
    485482  /*char background[] = {'B', msb(BG_COLOR), lsb(BG_COLOR)}; 
    486483     drv_D4D_send(background, sizeof(background)); */ 
     
    527524 
    528525 
    529 int lastVal[48 * 40 * 2]; /* ToDo: MAX_WIDGETS*2 */ 
     526int lastVal[40 * 40 * 2]; /* ToDo: MAX_WIDGETS*2 */ 
    530527int drv_D4D_bar_draw(WIDGET * W) 
    531528{ 
     
    584581  cmd[2] = msb(y1); 
    585582  cmd[3] = lsb(y1); 
    586   int y2 = y1 + (YRES /*-1*/ ) / vals - 1; 
     583  int y2 = y1 + (YRES) / vals - 1; 
    587584  cmd[5] = msb(y2); 
    588585  cmd[6] = lsb(y2); 
    589586  if (val[i] > lastVal[lastValIndex]) { 
    590       /* cmd[1]=col*XRES; */ 
    591587      cmd[1] = col * XRES + lastVal[lastValIndex]; 
    592       /* cmd[3]=cmd[1]+val[i]-1; */ 
    593588      cmd[4] = cmd[1] + val[i] - lastVal[lastValIndex] - 1; 
    594589      cmd[7] = msb(FG_COLOR); 
     
    596591      drv_D4D_send_extra(cmd, sizeof(cmd), 2, 5); 
    597592  } else if (val[i] < lastVal[lastValIndex]) { 
    598       /* cmd[1]=cmd[3]+1; */ 
    599593      cmd[1] = col * XRES + val[i] - 1 + 1; 
    600       /* cmd[3]=col*XRES+max; */ 
    601594      cmd[4] = cmd[1] + lastVal[lastValIndex] - val[i]; 
    602595      cmd[7] = msb(BG_COLOR); 
     
    654647int drv_D4D_init(const char *section, const int quiet) 
    655648{ 
    656     info("drv_D4D_init()"); 
     649    /* error("drv_D4D_init()"); */ 
    657650    WIDGET_CLASS wc; 
    658651    int ret;